Merge "ART: Remove LLVM cruft"