Merge "Camera NDK: Do not enable overrideToPortrait in ACameraManager" into tm-qpr-dev