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

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

Change-Id: I9bdd74702f2cf21a52eb5b99ba474e96fd647d7e