Remove dependency on libsoftkeymaster. am: fcc4c5c71b

Change-Id: I80a3f4f8a9b9715e63ad84365cf2793b5aaf1446