Snap for 7189131 from 9434ea992ea26f5d57b68297f8ad6ca86c7880f1 to ndk-r23-release

Change-Id: I4f55efc065f8b18282cbc783a96c0a3f23ec51e3