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

* commit 'c54157992d5e4f4f3568868f6ea85565824a7750':
  MIPS: Improving art_quick_imt_conflict_trampoline

Change-Id: I4ca3ccd072af700c591b9f33ebe2e0a2baef55ed