Merge "Disable File.getCanonicalPath caches." into oc-dev
am: 859fb2caa0

Change-Id: Ic877b8b805e45cf7c2d617d37c74117226b65ffb