Cleaned Android import
Merge branch 'master' of https://github.com/sessionm/phonegap-plugin