Merge "CameraNDK: codegen metadata update" into nyc-dev