Revert "Update ART for LLVM merge up to r187914."

This reverts commit b8a874ca3b13007f4bf688963483ffb3c76e0d7d.
2 files changed