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

Change-Id: I94cbfa64c64f02fd3cd9d0f5f6beeda925af65a2