This uses the new, cleaner factoring of our Android config from #4194 as an excuse to update some of our Android dependencies to bring them inline with what's used in current android-components. It was much easier than it has been in the past!
Due to the nature of the libraries we're providing, these are currently unavoidable (and IMO, dubious even were that not the case).