Merge "Camera: Implement HAL1 and higher HAL API coexistence"