Merge "aconfig: fix formatting warnings" into main