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

Change-Id: I5b87319352c86e7ddda1863d8fe4b3d6d569bec1