Merge "camera2: Update CameraService for HAL1 shim."