Snap for 7333099 from 913db0f93e8cd7160b1cfcb45e79eadb085c3bf2 to ndk-release-r23

Change-Id: I5f4827cf0555249a9f0f3b20b13edbea2bd37db6