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

Change-Id: Id9a60ebbd282026ab7a0ff5bc85757a5c545ffb7