Snap for 8018583 from d1c03aac18661c5e1b08b8f8561f946b60021867 to ndk-r24-release

Change-Id: Ibccf97e82d39869ef2aa2c6e0fbeefbc0b6705a0