Merge "Fixed the issue that dirname: META got zipped twice."
am: 8b6458e9a9

Change-Id: Idd8eb1727778c52a8abea497477e3999c3d9706d