Exadios branch: Post merge cleanup.
Exadios branch: Added xcsoar/android to documentation.