Merge "Set up to use aconfig flags in test files" into main