Merge "Remove mips workarounds." am: d5e0cd82dc am: 36934dc30f

Change-Id: I4dc7d3e09013ca2b596adb70e52dbb34f34a26b1