(Android) RetroActivityLocation - some cleanups