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

Change-Id: I0f19fc1908f84da6f602564d57256423b108bf16