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

* commit '14c79bb8db40a38156b4ef228539c6e69c022063':
  Move ZipAlign to build-tools. DO NOT MERGE.