am 25b9385c: (-s ours) am bff5b88a: am 14c79bb8: (-s ours) am f3ff0296: Move ZipAlign to build-tools. DO NOT MERGE.

* commit '25b9385c590e18f3e9b4949286f6d44a901a673f':