Merge "Camera NDK: fix deadlock issues" am: c89e8b4e31
am: 7522135738

Change-Id: I8c9d5b36e97d0df2c30625a1857d6cc584336552