Android: More Cleanup, Bugfixes

Cleaned up a few additional build artifacts that snuck in.  Also squashed a few market-reported crashes.