am 30aebed9: am 038919d3: am 507f95e2: Merge "Update script to copy in extra generated files."

* commit '30aebed98ab66329d62e0884209fd9d04a8b056f':
  Update script to copy in extra generated files.