Fix some lint/style error am: 1d99ae1932 am: d9ff8385fe

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

Change-Id: I76acacf4ab3ab9c6645e4e02c6c13dd864d91591