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

Change-Id: I6b824a1ae1eb66a98aafc8c0148b0b49006edd8a