Merge changes I4c6abd96,I9bcf36d0

* changes:
  Replaced android::Vector with std::vector.
  Adjust to handle the change to std::vector in libbcc.