Merge "Update zipapex tests to run fully out of the zipapex" am: 5d3ac96501
am: a212a7d079

Change-Id: I3f6db6a164d28120aa89120781d2259f697be3b4