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

Change-Id: I62235e5fc3116bb6d65f04b4c203e94f0b599752