Merge "Always pass --root to cpplint" am: bd1f04373c am: cd8c833ed7 am: 6676ded828
am: a8257b78bf

Change-Id: I2e7cff515ccbb1b0831003e656c580ba8a6cee8c