Backed out changeset 9678f9a596d8 (bug 877072) for B2G ICS Emulator Debug m3 and m5 test failures