Merge "Add a cpplint preupload hook."
am: 432fccc4c0

Change-Id: Ie3edcc46b0781d92e137dc7ceb0f13506aceb748