Merge changes from topic "camera_ndk_fixes" am: 35f148bc5a am: ee6b817886
am: 6928bc3506

Change-Id: Id0738d4d84b4715e2579d6e77f64b795ff1d2cb8