Merge "Remove mips workarounds." am: c10415f4fb

Change-Id: I844750cda3a65425d6e07c2d57f3450596f1f300