Snap for 7485283 from 637b84a9d4409cfc5f916814b58cd8406f74944f to ndk-release-r23

Change-Id: I2cc254c6f78b2bf3ffce4f4825094885f1ab4d14