Or is it the other way around: they're giving up on "FireOS" and just going to let Google do the work?

Good idea. Most people would probably be happier on a more stock Android with the Google Play Store.