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

Change-Id: I829279c166f871cba192ba4652b2e53e9e29b6a2