Snap for 8079471 from 7aea7e9880110799088cd1de509886871078306f to ndk-r24-release

Change-Id: Ie890b51fdc56292490024852e8513e9175397ec4