Merge "Camera: Minor fixes to camera3 HAL interface" into jb-mr2-dev