Merge "Camera NDK: fix deadlock issues"