Snap for 7173131 from 9977663e6b99019a0887b9ae30d266331001162b to ndk-release-r23

Change-Id: I13fcd3393a1e6e622de8f0841378e405fa643190