Backed out changeset b43bbab312e7 (bug 829747) for ABORTs on Android 2.2; CLOSED TREE