Backed out changesets 0cb5418906cf and 3c366c865e73 (bug 803299) for Android bustage.
CLOSED TREE