forked from github/cordova-android

Merging all non-StudioProjectCompat work into the 6.4.x branch for possible 6.x, or 6.4.x work in the future.
Merging all non-StudioProjectCompat work into the 6.4.x branch for possible 6.x, or 6.4.x work in the future.