Merge "Include all *.aconfig files under aconfig directory" into main