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

Change-Id: I0b8e66fc1df71f27f17cd3f56b5660e4828a2b78