Fix cpplint issues am: 26b82b166a am: f371917b6b

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1931303

Change-Id: I13e786ba1834122c31fb55008dddcd91bfee6b2f