Merge "Build soong_zip and zip2zip for prebuilts/build-tools" am: b52e88f2 am: 6f586383 am: bf1f24da am: 3ba76704 Change-Id: Ic37a1fa4e1d48c822363431903e52a82999d57ec