Merge "MIPS: Follow-up to "Allow deoptimization when returning from a runtime method""
am: 560b7c8f7f

Change-Id: I246942506c110370bbe82502b9be14598744951d