Remove mips workarounds. am: 748aa1e459 am: db13a9728d

Change-Id: Iceda6e002ab9622fc5a04d804f33631c4cf95a74