Merge "Always pass --root to cpplint"
am: bd1f04373c

Change-Id: Ied799b9ab7258d8fd529cb6502efd8509500d624