Merge "adb: fix erase-remove_if idiom."