Fix build breakage caused by keymaster changes.

Bug: 31439506
Change-Id: I010f918511d6764cd74531129504eddc6e46d3e5
3 files changed