Merge "aconfig: cache flag value in generated java code" into main