Backed out changeset 33ff09852b0a (bug 1039162) for ics emulator opt/debug test failures