Merge "Add logging for zipapex failure."
am: 6b6f817b33

Change-Id: I98255fba94eaa51c9fffebc3ba4deea9c9d2b01e