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

Change-Id: I6e7a88907bdd993df80b9f2b94b2fb9492c80b19