Fix minor linter issues around includes and using.

We also remove the "using std::string" clause from the files that were
using it to simplify the integration with google's string type.

Bug: None
Test: Build and ran unittest.

Change-Id: I752040494f6a6bb8447d8ff6d7cc2cf2784085d6