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

Change-Id: I9e914c86c4f26814a208821fecd3987add078311