Revert backouts

[jo]

Android patch fixing recent test failures: https://phabricator.services.mozilla.com/D242808

Pull Request checklist

• Breaking changes: This PR follows our breaking change policy
  • This PR follows the breaking change policy:
    • This PR has no breaking API changes, or
    • There are corresponding PRs for our consumer applications that resolve the breaking changes and have been approved
• Quality: This PR builds and tests run cleanly
  • Note:
    • For changes that need extra cross-platform testing, consider adding [ci full] to the PR title.
    • If this pull request includes a breaking change, consider cutting a new release after merging.
• Tests: This PR includes thorough tests or an explanation of why it does not
• Changelog: This PR includes a changelog entry in CHANGELOG.md or an explanation of why it does not need one
  • Any breaking changes to Swift or Kotlin binding APIs are noted explicitly
• Dependencies: This PR follows our dependency management guidelines
  • Any new dependencies are accompanied by a summary of the due diligence applied in selecting them.

Branch builds: add [firefox-android: branch-name] to the PR title.

[bendk]

This is just re-applying the changes we've already approved right? Seems fine to me.

[dsmithpadilla]

if possible , could we land this after the glean patch (1953191) lands in central? I'd like to make sure they land separately in case of any failures.

[bendk]

That sounds good. Jan-Erik and I are working through the Glean/UniFFI changes. Let's merge those today/tomorrow and this one after. Does that work for you @jo?