Merge "Make zipAlignExe come from Build-tools" into idea133