Accomodate changes to 4.0.x branch that deleted Cordova*Client interfaces
Merge branch 'master' into plugin_with_arm_binary

Conflicts:
	plugin.xml