update android guide
Merge branch 'heroku-edition'

* heroku-edition:
  update android guide