Fix some lint/style error am: 1d99ae1932

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

Change-Id: Ia9f5b7e89a9a27c6c4447aeae21fdb3a172a5eb2