Merge "Always pass --root to cpplint"