Merge "Camera: codegen NDK update"