Merge remote-tracking branch 'llvm-upstream/master'

This brings in r236319:
Fix float->uint conversion for inputs less than 0