Merge "libutils: fix cache removal when callback invalidates the key" am: b0df9dca7c
am: e483305e47

* commit 'e483305e4736787c5395d2d20b2be1d17d573ee7':
  libutils: fix cache removal when callback invalidates the key