Merge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485 am: 96963dfd4d am: 592cfc1859
am: d479b69c0e

Change-Id: Ic7562872059697f09a8cbf01765c6d58bd3782a9