Merge "envsetup,product,ninja: enable symlink traversal"