Rename for consistency.
Some needed changes after upgrading Google Play Services lib.
Explictly forget things in an attempt to ameliorate memory leaks

Explicitly nullify/clear thing we no longer need when the Map fragment is stopped. We could still be leaking something here because the problem isn't completely gone, but hopefully nothing we're now null-ifying is the culprit.