Merge "Remove mips workarounds." am: 72df1bfdec am: 37433cf916 am: cf1fa69aac am: 1ba034421c

Change-Id: Ib38d09639e046072164403851a1cbaa4babaa64e