Back out changeset f698c8166457 (bug 1035075) for B2G ICS Emulator Opt mochitest-7 orange.