Backed out 2 changesets (bug 1900345) for preventing Fenix builds with Android Studio in the repository root. a=backout

Backed out changeset c2b76f322973 (bug 1900345)
Backed out changeset 694338ffad92 (bug 1900345)