Merge changes from topic "camera_ndk_fixes"
am: 35f148bc5a

Change-Id: I0e8da27ad9d603597ee1741c3e89322f98dedd94