Finally got maps activity back onboard.

Finally fixed some of the issues with things not importing out of GIT
into eclipse correctly.