Backed out changeset 87ed776cbacd (bug 1014466)
Backed out changeset 355e895f7ae9 (bug 1014466)
Backed out changeset b85f5ec21392 (bug 1014466) for Android 2.3 Opt M-8 test failures on a CLOSED TREE