am 46df1818: am f0dda8d0: am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."

* commit '46df1818157abd7e8e7288219c3992e1ed451a47':
  Build changes necessary for LLVM 3.5 switch.