Merge "Revert "Camera2: Add camera pose and distortion fields""