Merge "MIPS: Improving art_quick_imt_conflict_trampoline"
am: 1e24b28

* commit '1e24b28e89223dc4749a54582e7eaf929ca0cb5f':
  MIPS: Improving art_quick_imt_conflict_trampoline

Change-Id: I3e19e7c9ae0d8cb45dbfdd5edaff6c2ea2853879