Merge "Remove zipalign from the SDK tools." into idea133