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

Change-Id: I34a6934df3c506421470d52fb854f98bfac2423c