Merge "Remove mips workarounds." am: 4796b31d95 am: f52ec79d72

Change-Id: Ifbc69d08911057efba674147eddb7f3f1ebea189