Remove dependency on libsoftkeymaster. am: fcc4c5c71b am: 1c550eb78f

Change-Id: I47d8d65344bca6a8911f87f49279dd4ce8695481