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

Change-Id: I98d5e9f7692a0895f9bc4487803cad61dc8f5382