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

* commit '9f0864dd2a9b1b68da6bb34f025d5519f16ee5ff':

Change-Id: Ib6e6c868e77b5c2c5a103f9f8f7647cca5fa4010