Android: Cleanup, bring up to date

Cleanup the app, remove obsolete source and resources

Change-Id: I53b5da91796ab57fb1de9229621c3f810da8737a