Merge "Fix DEX zip open error message printing"
am: f39d422552

Change-Id: Id0545df9c324e204172607c8f4b388fac8efbefa