Android 12.1.0 release 21
Merge "Update s2-geometry-library-java-tests to not run in TEST_MAPPING" into sc-dev