Merge "update cpplint"