Fix existing duplicates in android_devices