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

Change-Id: Iadcd032c968c5db68651e184f6a4c558c33aab22