Merge "Split android_non_updatable_stubs_libs" into main