Snap for 10321980 from fab96d98127b722c4be452dfc24a1ff629d36f79 to ndk-r26-release

Change-Id: Ib2e12df680c393f8b2c8c4a3f0464b8fbaf6a501