Merge "Merge cherrypicks of ['aosp/2188718', 'aosp/2200318', 'aosp/2213723', 'aosp/2255356', 'aosp/2388575', 'aosp/2396162', 'aosp/2392413', 'aosp/2392414', 'aosp/2392415', 'aosp/2392416', 'aosp/2396222', 'aosp/2397738', 'aosp/2395932'] into ndk-r25-release." into ndk-r25-release