Clean up some compiler warnings am: ad8d7e39d8

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

Change-Id: I558760522e944a0dd9358deb37f223440d13ace8