Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4a

Change-Id: I2e35dfc0ba64379be18a226a4675990c4332caf9