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

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

Change-Id: Ib9ea210c748a8a0d202fb25d465efbfca8242ad0