Merge "Remove mips workaround." am: d621bdcd9a am: 98cfaf5b4a am: dbe1db07e8 am: 778644cae3 am: ed4f2e147f

Change-Id: I6c81bc338f70b5746365eb2b632626ca6486e688