Merge pull request #578 from adminempire/master

Updating android-sdk*