am d72317ab: Remove keystore entries when package removed

* commit 'd72317abd79ddf95d48c8f35bf1070900ff55b5e':
  Remove keystore entries when package removed