Merge "ART: Fix lookup class used by invoke-custom" am: 78a6ce868a am: 9b2695564f
am: 3e7e6eeb58

Change-Id: I022d541d402a3e43dbd3eaa8187aa01dc02450e1