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

Change-Id: Ied0e6233854db55e76498da2ca239ca6773ce59f