[automerger skipped] Merge "ART: Fix MethodHandle invoke-super" am: b143d262c5
am: e2db2a335e  -s ours

Change-Id: I586df44ad411a370fe90ab0ea6350bf5b139d83d