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

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

Change-Id: Id1f2662d006fbcd246b9db1ee29efb9e1f786b51