Fix remaining styling and compiling issues am: 9956320ffa

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

Change-Id: I24a8e2a69dfc9819bdc6fb30d3a2262d597d3459