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

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