Snap for 7491104 from bb67a39f61347b28576a691c3a901b87d751b4ca to ndk-r23-release

Change-Id: I64f8b8911ce21c28d2537b78b46fc843509e5700