Bug 912832 requires a clobber. r=me
Fixup for bug 912832 busting static analysis builds. r=me
Backout changeset 9c78c5ac85a8 (bug 907683) for Android bustage