Snap for 7123158 from ec5b8b47d48158c186ff2fdc1a0c83d1eab850ae to ndk-r23-release

Change-Id: I5582d9c3c2b4c9e59b6a317c4b6c18c451d347c1