Merge "Remove mips workarounds." am: 72df1bfdec

Change-Id: I8d7efb5ce19e1fee2360b38bf0b6f48a9b12c2da