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

* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
  Move ZipAlign to build-tools.