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

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