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

Change-Id: I9278e39647742f001b55e40d8f7e7bf10dc1b8e0