am e2228683: am 8821b239: am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools."

* commit 'e22286831fee7684e9f826360c45bb19ce8b2cac':