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

* commit '727893369bba07e12d695511a5c4309d3d50d507':
  CameraNDK: codegen metadata header update