Merge "resourceloader: Use content-neutral context when computing module versions"