Use numeric codes for Android versions, to avoid SDK dependencies (cherry picked from commit 3f6b2d1a61d0c0dcd6af7cc951c1d8c267ed1526)
2023-05-22T11:51:09