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

Change-Id: I1eb98e525b3794e561eafd3997ae6bfb0c7bdd92