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

Change-Id: I8b1b7822202d54fe4565f237d4195f227e483fdc