Clean up some compiler warnings am: ad8d7e39d8 am: 984e211450 am: 3ff2f52a22

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1984095

Change-Id: I6062b9c45ff4798fb9da624ffba1593bf112f6b6