Subtask for https://github.com/android/ndk/issues/1299 clang-r416183c already has this, so we just need to update from clang-r416183b.
Subtask for #1299
clang-r416183c already has this, so we just need to update from clang-r416183b.