Merge "cpplint: Remove many unnecessary NOLINT"
am: 8acd00f9e6

Change-Id: Ida84c9194b83c83f6455a5a87f672da179991f02