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

Change-Id: I5584c229315dd92d2a2c0e6218ef21743820234d