Merge "adb: fix erase-remove_if idiom." am: c2a2ecb7a5
am: 1f3763ef4a

Change-Id: I8edeb4df0f168e08e895b4bad8dc9c85bd21c179