Merge "aconfig: fix workspace resolver warning" into main