Snap for 8079471 from 6bcf0f05307673bca6b7cc08f33b1bfabd95f189 to ndk-r24-release

Change-Id: I2e43c38426e0b6a64123d3bab967227cbd3a888e