Android NDK r23 Beta 6 (7530507)
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6d6c9c7e26 -s ours am: fd31f4821a am: 337ac2199f

Change-Id: Ic2ad0c2689906976e229a16d0c9be22facdd33da