[automerger skipped] use vector::erase with std::remove_if am: 0c52b652 am:...
[automerger skipped] use vector::erase with std::remove_if am: 0c52b652 am: caafff5d am: 5d98a62d am: 2fcb8303 -s ours
am skip reason: Change-Id I9244baf7d6f46cce4c2d8f66fcf57b19c19d32ab with SHA-1 0c52b652 is in history
Change-Id: Ic5a9ec7383fd3e118e1c9fb91f0dde2cbba2efa1