am 3e3d591f: Fix cpplint build/namespaces issues

* commit '3e3d591f781b771de89f3b989830da2b6ac6fac8':
  Fix cpplint build/namespaces issues