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

This reverts commit eaeab46304a139da495de941e853ce9acdace175.

Change-Id: I854e09c9c988702de08a9ff642619761d1d57639
(cherry picked from commit 03feadd72f6205f0b88fe69aaa30c69d1b2e8c2d)
2 files changed