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

Change-Id: I1091354c0726350a0031b866bb9fc026c8b6115c