Merge "Add the build type to META folder in target files.zip"