Merge "Merge "Camera: Add media/camera NDK documents" into nyc-dev am: 470241b168 am: 951dbcce95" into nyc-mr1-dev-plus-aosp
am: 6a55e4487d

* commit '6a55e4487dbb38d6a064e5e83e05c6772d5eb076':

Change-Id: Ic760d4f9dc052afd0e29326d681f4ca47d7af0c0