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

* commit '3935a003e2366a74c6189d651e3473cceebe5145':
  CameraNDK: codegen metadata header update