Merge "Merge "CameraNDK: fill in more NDK API documents" into nyc-dev am: b7444b1d60 am: 165134a1dc" into nyc-mr1-dev-plus-aosp