Merge "Camera NDK: fix bug in lock order" into oc-mr1-dev
am: 3624a0b582

Change-Id: I5b9d5654a96547a3862c183383b0320a8df1d3d0