more android fixes
Merge branch 'master' of github.com:krebscode/painload