Backed out changesets b1b292d8e383 and 24af5272b52f (bug 913842) for Android bustage.