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

Change-Id: I78bd6437cf3fa95e54147f74bc6297c264858c01