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

* commit 'a494ae9bafcd36329804b090909c23b2377fd4e1':