use vector::erase with std::remove_if am: 0c52b65211 am: caafff5d40 am: 5d98a62d5b

Change-Id: I8a2bc66edbda58f7125ba9bb420467b095cd0045