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

Change-Id: Ic47b5630a30235775d22a81258dae6b4caecf556