Merge "camera2-portability: Remove Camera.CameraInfo accessor"