Android: Bugfixes and Speed

Fixing a few bugs found in this last beta and some incremental kaizen towards improving #612.