Revert "Revert "Fix warnings in servicemanager and KeyCharacterMap""

This reverts commit b480269b0f8e933fa6fc6bd4c9e1e504e1b51508.

Change-Id: If405c0786c5bdd02e3f2c3356d56a4200c6b9dfb
4 files changed