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

* commit 'd6ccbcd253d34feb75cba4cbd98f520dfa789757':
  Move ZipAlign to build-tools.