Merge "Revert "Use soong_zip for otatools.zip, platform.zip, and otacerts.zip""