am 6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev

* commit '6d20c2e2d88de0116203e2d6ba80b996f858abc1':
  Fix imt conflict trampoline for mips64