Merge "MIPS: Fix art_quick_instrumentation_entry/exit" am: 4f647ebe81
am: 4b3705a08b

Change-Id: I4168c5fbcde68017836e2b05fa9e68cec88e8fd8