Improve Android support in build system.
Merge pull request #109 from whitequark/android2

Improve Android support in build system