Snap for 7478747 from 5c50d9486dca1adc26e09981f8a8898cff7c835a to ndk-release-r23

Change-Id: If50050269f9ce64498cfd7fdf91b5449b89b2565