CB-2447: Remove use of deprecate org.apache.cordova.api.Plugin
Merge branch 'CB-2447' of git://github.com/jamesjong/cordova-android