Merge "Move aconfig-srcjars srcs into shared defaults" into main