Android: Bugfixes

Fixing half a dozen bugs found in B5.  Also did a cleanup pass over the code in our continuing quest to eliminate cruft from the old design.