update android version to recent changes
Merge branch 'master' into mrhines