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