Merge "Remove mips workarounds." am: d5e0cd82dc

Change-Id: I4ce4cc20548f5e7ec5a3f278fb98f68160a41ef6