Snap for 7179171 from d197e921152a698f9fca15cd89e3cd298532d382 to ndk-r23-release

Change-Id: I13c3ec6eb2070e5e0814de87ae7b7d9f24725df4