Fix cpplint issues

Existing cpplint issues block uploading CLs, fix most of them.

Test: m checkbuild
Change-Id: I3477d388659c93c1ca517c4ad37502e0a71014ad
diff --git a/payload_consumer/install_plan.cc b/payload_consumer/install_plan.cc
index 2bd81ae..db0af4e 100644
--- a/payload_consumer/install_plan.cc
+++ b/payload_consumer/install_plan.cc
@@ -26,8 +26,8 @@
 #include <base/strings/stringprintf.h>
 
 #include "update_engine/common/utils.h"
-#include "update_engine/update_metadata.pb.h"
 #include "update_engine/payload_consumer/payload_constants.h"
+#include "update_engine/update_metadata.pb.h"
 
 using std::string;
 using std::vector;