Move the AuthenticatorActivity role to OAuthActivity.
Lots changed here

If I'd thought about it, I'd have done more commits.

Compiles and almost runs