Merge "change ownership of for-system subdirs to AID_CLAT" into main