Merge "WIP: Camera HAL module 2.1, device 2.1"