Snap for 7250032 from 52aedff52cf4ee85225cc3e10e3d4bb7847d1b80 to ndk-release-r23

Change-Id: Id3c72744e71ca8281078cc88c6069b672a3638a9