This is a cherry-pick of https://github.com/google/styleguide/pull/159
(plus some code that it depends on).

BUG=627514
TEST=cpplint_unittest.py

Review-Url: https://codereview.chromium.org/2146553003