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

Change-Id: Ic0c072790537c9e7d75c9f97a71a6a4e62d24b06