Fix build failures and accept clang suggestions am: ff6a5f9dc9 am: 66026efeeb am: 9dae596dd3 am: 3e08a5ae1d

Original change: https://android-review.googlesource.com/c/platform/external/piex/+/1730751

Change-Id: Ie6d7d225f0e3c87504aa2591ca9674cfb45307ab