Build fixes for hardware keys

Change-Id: I070435090c9d32c9ee4d1518f2ab3c08e2a08b69