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

Change-Id: I17ea34d623a19d249c815b9b99356e108ecd20d4