Merge "Move aconfig files to aconfig folder" into main