Snap for 7478747 from 076a77ac83e92c873f1fbf05b8b39d2f56a5c570 to ndk-release-r23

Change-Id: Ic2d101aa5aa608f380c3522bd86168033fd785c6