Snap for 7255932 from aecab9ab9144e14ea84a3cf414f110f90d0ad73f to ndk-r23-release

Change-Id: Ibc15fb31751c5f9206007d9431930954a7a5d8a0