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

* commit '8821b239d175f441c1631f9ce04f9b0109dd3a72':
  Move ZipAlign to build-tools.