am 64fa69d1: am 254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP."

* commit '64fa69d17ed8e67f118873d8ac3394e220b7dbe6':
  Switch to LLVM 3.4 prebuilts in AOSP.