Android: Bugfixes

Squashing a few bugs that were reported in the 3.6 release.  Also started some much-needed cleanup of minor bugs that were clogging up logging.