Snap for 7179171 from 839c442cf576ce973bc7fbe2137b220f0d4e6bf8 to ndk-r23-release

Change-Id: I0a35d903c43d7392c3ab96bc5037fd338d2c52b2