Merge "Add sdk_version to the 'libeign' module" into android12L-tests-dev