Merge "Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions" into main