[automerger skipped] Remove dependency on libsoftkeymaster. am: fcc4c5c71b am: 1c550eb78f am: 729ea4591b -s ours
am skip reason: Change-Id I9310a851648c028850f9795d303419c6a7e29a11 with SHA-1 2adf7fb2d5 is in history

Change-Id: Id81888329c026e0ba641f0f5a93b4b1d32ab6371