Merge "ART: More refactoring of invoke-custom tests"
am: 74c342fb62

Change-Id: I9061a859f37d6c43533dd0e16b4ba46634a46183