Snap for 8018583 from e2c784f15912115f778e427f0ce9a21189a3b494 to ndk-r24-release

Change-Id: Ief7d3395179bdb81e4f9ab1e998110d0feb4486f