Android NDK r24 (8215888)
Snap for 8079471 from ff4d350e7893c13ec92456645ea0ade177e84fd6 to ndk-r24-release

Change-Id: I133b384db81a3af3e8310af9da3a7ce3b9b53f75