am e9c79f66: Merge "Revert "Replaced android::Vector with std::vector.""

* commit 'e9c79f66478170e4e45e49c71f5e9324842916cf':
  Revert "Replaced android::Vector with std::vector."