am 67166b6e: Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2

Merge commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1' into eclair-mr2-plus-aosp

* commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1':
  Cleanup the cache file when we decide not saving it.