Merge "noop: change from deprecated __ANDROID_API_*__ to constants" into main