Merge "Revert "Revert "add aconfigd-system binary to be installed on /s..."" into main