Merge "Fix MethodHandle resolution for invoke-direct" am: 092af0b51a am: 31b3a17b24
am: ff9daa4008

Change-Id: I988f3ddd5e36593d0f037f4458f7a502942bd37b