Fix up onReceivedError() to match change in cordova-android
Merge branch 'master' into plugin_with_arm_binary