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

Change-Id: I55d2a7135e410cc497fc49bfc936b3e235e116cb