Remove Android-specific imports, see cb5915
Merge pull request #22 from raphaelm/master

Update with latest commits from raphaelm