Snap for 7956253 from 355eca4c47809879a76335f670f9e48e0849dc05 to ndk-r24-release

Change-Id: I1de4d98bd54a12a15f5d5935c05b1f2ae28adb59