Merge "Add the build type to META folder in target files.zip" am: 53a6fd6498
am: dc43cddbf6

* commit 'dc43cddbf613daeda98c02836d6ff82592fc53f7':
  Add the build type to META folder in target files.zip