Merge "MIPS: Follow-up to "Add two special runtime methods""
am: 34484e4287

Change-Id: Ib0d5b8493890baf6c82c5ce4b146981006c3a841