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

Change-Id: I4ede1c1fad435b4059a85450241b450079b338e8