Rebase and squash mobile and desktop patches

The patches for mobile/android are separate from the patches for desktop. Some of these patches are similar, such as adding a mozconfig and overriding prefs. Now that Android is a first-class supported platform, we can squash some of these patches so we reduce the number of patches we need carry on top of Firefox.