Revert^2 "Only extract zipapex once for linux-bionic-zipapex tests"
am: 6f342dd00e

Change-Id: I1951bffc6d6534046d227855adb6ec67ba1d5d2f