Merge "Camera: codegen NDK API update"