Backed out changeset c3780924e7b4 (bug 966646) for making b2g emulator tests frequently time out