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