am 34de74bb: Merge "Update ART for LLVM merge up to r187914." into klp-dev

* commit '34de74bb9d91534ab7ebbd1f73ee1d96db894b4c':
  Update ART for LLVM merge up to r187914.