Merge "Change the symlink to system_ext"