Merge "x86/x86-64: Fix IMT conflict trampoline for obsolete methods."