CB-8031 Fix race condition that shows as ConcurrentModificationException
Merge branch 'master' of https://github.com/apache/cordova-android