Fixes bug 915198 make update_android_devices() work without dupes

r for @brandonsavage