Merge "Fix test suite zip generation on mac" am: 94be321cae am: c1ed882bd8
am: 3f7ab5f080

Change-Id: Ie494bc225a72c454f48ac6cb30cf10e333afbcb6