Merge "Run unzip with -o -f for zipapex tests"
am: 4ee4561f21

Change-Id: Iceba6ea8467f775d8fbcd9c054def5ea3cb3cb0e