Snap for 8079471 from f7224e0c089c1535cf86381a023fa380a2dafb87 to ndk-r24-release

Change-Id: I8b78e560f4a52b21c2096e77c3e0466b0d943fa4