Merge "Revert "Disable broken mips strace build."" am: d5bce2f27b am: 304752e0d4
am: 308b9f770e

Change-Id: I1695d490f89584cb0c554713dc865f4b5dcca031