Merge "Camera: update NDK metadata tag documents am: c9c2c6849c am: a92f6c639f" into nyc-mr1-dev-plus-aosp