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

Change-Id: I6ebaaaac6f51b63c275323e7c02eee652cf4c3fe