Merge update from upstream llvm-mirror:master