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

Change-Id: Ieca7f44cdaebd695c45a95df81c29cbc20897752