Merge "Merge "Camera: update NDK metadata tag documents" into nyc-dev am: 7e038c3072 am: 53c87d5bb0" into nyc-mr1-dev-plus-aosp