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

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

Change-Id: I46f07a3503de49f2c09af96f8a4c8b681ff433b1