am 4bbc12a0: Merge "Fix softkeymaster EC group memory leak."

* commit '4bbc12a092008b14ca8db6487435de42d1e54ec1':
  Fix softkeymaster EC group memory leak.