initial android version
Merge branch 'android'