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

Change-Id: Idda62c922dd4d70b204bf8119b42d8b88caf107d