Merge "Replace usage of "vector<>" with "std::vector<>""
am: f611c0457d

Change-Id: Id39267e97e8e1448e9fcd9c6811455d9a632c27c