Merge "Add aconfig-annotations-lib as build time dependency" into main