Merge "MIPS: Improving art_quick_imt_conflict_trampoline" am: 1e24b28 am: c541579
am: e5dfe00

* commit 'e5dfe00360bf74a022b90f72bed39b844d879491':
  MIPS: Improving art_quick_imt_conflict_trampoline

Change-Id: I14a88d76203127483c9d6a29ec95f5e717ee5aca