Update whitelist logic based on unplug-whitelist branch of cordova-android
Merge branch 'unplug-whitelist' into unplug_whitelist_with_binaries