Merge "Update ART for LLVM merge up to r187914." into klp-dev