Merge "MIPS32: Allow some patched instructions in delay slots" am: ae53f10531
am: 57e3caefca

Change-Id: I0d24d591b2b50ba8ab33cb0f58f1c8859d5a9508