Merge "Revert "ART: Support interpreter switching in x86 mterp""