am 3fa79f84: Merge changes I4c6abd96,I9bcf36d0

* commit '3fa79f84fcce0b5f59498980a2bb8e355cf53cd4':
  Replaced android::Vector with std::vector.
  Adjust to handle the change to std::vector in libbcc.