Merge "Camera: codegen NDK header update" into nyc-dev