Android quickstart fixes
Merge pull request #162 from yavorg/dev

Android quickstart fixes