Merge "Use ASM for invoke-custom tests"
am: 92105543a7

Change-Id: I84240c43492b97bd9ca4460da22ea0646d10ef11