Snap for 7956253 from 01b2f4d961c39ddfa14226f4a704ee73efd589a6 to ndk-r24-release

Change-Id: Iaa1ac90b3f264307c94c0a6741a19cc751c7b03d