Merging r143303:
------------------------------------------------------------------------

llvm-svn: 143450
tree: e231831de57d80feb63c83f25eaa9f0ee33338df
  1. clang/
  2. compiler-rt/
  3. libcxx/
  4. libcxxabi/
  5. llvm/