android update
Merge branch 'master' of https://github.com/sergeyreznik/et-engine