Fix remaining styling and compiling issues am: 9956320ffa am: 23fcecab94 am: 6cc65647da

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

Change-Id: I9a4a1131b0cbbdba684dbb244dba7aaea170edd7