Merge pull request #796 from joakim-noah/android

Odds and ends for Android