Merge "Specify aconfig_declaration modules in java_sdk_library" into main