Bug 1083347 - Removing entries from android23.json and annotating manifests. r=gbrown
Bug 1092507 - Unbreak --disable-dbus build after bug 1088628. r=tbsaunde