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