Build universal wheels by default

Change-Id: I38a8016ad7348d50b63dc6cd42118948f2cdf4de
Merge "Build universal wheels by default"