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

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

Change-Id: I50f0636c163280e3eaacaf9232053635444910ef