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

Change-Id: I5c4295c75461870fdddfabd153fb73fcff67ffa7