build: Fixing gcc 4.8.1 warnings from KeyLocator

Change-Id: I89910f3623e0c903246cc4931343fb6f20bd72f3