Merge "Camera: codegen update" into nyc-dev
am: 0ae49cc667

* commit '0ae49cc667c20a30ba800bfb03c4caf872169d93':
  Camera: codegen update