Merge "Fix running zipapex tests with arbitrary cwd."