Don't pollute the namespace for two uses.

Clang complains about ambiguity between std::hash and ::hash (locally
defined). There's no need to pull in the whole namespace for two uses of
std::map anyway.

Change-Id: Icbaa7ebbaad05999988784ad34662c721fb12b29
Merge "Don't pollute the namespace for two uses." into du44