Merge "Make unzip available."
am: 5efd2abee5

Change-Id: Ied58829bb8735c34367c9f947b842a1afef894ce