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

Change-Id: I76f3d2835d9bb5e7123b7cc1ed64cda5f0e6594b