Backed out changeset 30bf232b44f7 (bug 878674)
Backed out changeset 8284007baae4 (bug 878674) for Android startup java exceptions