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

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