Merge "Add odm/* symlinks to system image" into main