Merge "Fix running zipapex tests with arbitrary cwd."
am: 770e7fc098

Change-Id: I121a2805bb05a9a97d89c73a549ec8531ee5e7af