Merge "cpplint: Use upstream cpplint"