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

This reverts commit 6a94caa048121858ee8e71f84caf7b9ae1f940df.
2 files changed