Simplify the detection of android.
This also makes it more robust.
Merge pull request #603 from vandenoever/android01

Simplify the detection of android.