Merge "Merge cherrypicks of [2168845, 2175186, 2181977, 2181978, 2182297] into ndk-r25-release." into ndk-r25-release