CB-2447: Remove use of deprecate org.apache.cordova.api.Plugin
CB-2446: Ugly, but workable fix
Merge branch 'CB-2447' of git://github.com/jamesjong/cordova-android
CB-2447: This is a non-trivial task.  Migrated test plugin to modern plugin API.