Snap for 7134739 from 08182aaf90eff9733c5b36d599f2446cc87d57eb to ndk-release-r23

Change-Id: I05bd6c030bf430f145eaa517963a4390786b1918