am 7ed8d7f3: Merge "Update ART for LLVM merge up to r187914."

* commit '7ed8d7f33665689a9538281fbb5c4915463dc2a6':
  Update ART for LLVM merge up to r187914.