Merge "Fix refs_and_args callee save order for Mips32."

diff --cc runtime/arch/mips/quick_entrypoints_mips.S
Simple merge

diff --cc runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index cd34d88,90d4a37..9947b55
--- 1/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
--- 2/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@@ -130,9 -125,8 +130,9 @@@ class QuickArgumentVisitor 
    static constexpr bool kQuickDoubleRegAlignedFloatBackFilled = false;
    static constexpr size_t kNumQuickGprArgs = 3;  // 3 arguments passed in GPRs.
    static constexpr size_t kNumQuickFprArgs = 0;  // 0 arguments passed in FPRs.
 +  static constexpr bool kGprFprLockstep = false;
    static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset = 0;  // Offset of first FPR arg.
-   static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 4;  // Offset of first GPR arg.
+   static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 16;  // Offset of first GPR arg.
    static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 60;  // Offset of return address.
    static size_t GprIndexToGprOffset(uint32_t gpr_index) {
      return gpr_index * GetBytesPerGprSpillLocation(kRuntimeISA);