Snap for 8018583 from fe9a8b11e7594a8d9aa90ef0f584ec4dc8c0031d to ndk-r24-release

Change-Id: I8f345555fde9bf99564d71f5564cded54a2c509e