Merge "Move ZipAlign to build-tools."