Merge "Use ASM for invoke-custom tests" am: 92105543a7 am: 1dc713789f
am: 65acd044fc

Change-Id: I96161ff5677d3b0ab0f53aee4a1ed5bca423da12