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

Change-Id: Ibd237a98bdd3e7a42780e8ad4f8c2d7913707105