Merge "Run unzip with -o -f for zipapex tests"