am 4d31c547: am ce7fa780: Merge "Fix a resource race bug in PathCache"

* commit '4d31c5474bcc4bcc6a6d8dfe232360dad701a3fc':
  Fix a resource race bug in PathCache