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

Change-Id: Ie8b573863dbe85148d544a7cd4351d2ebcc505a3