Merge "Camera: fix HAL1.0 support"