am d1aead76: Merge change Ie21b2327 into eclair-mr2

Merge commit 'd1aead768d5c6e4aa18c4f43e6be97f8a40fbf84' into eclair-mr2-plus-aosp

* commit 'd1aead768d5c6e4aa18c4f43e6be97f8a40fbf84':
  DO NOT MERGE: Removing the use of FileCanonPathCache.