Merge "CameraNdk: codegen header update" into nyc-dev