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

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