Merge "Avoid caching Android/media dentries" into rvc-dev