Android NDK r23 Beta 5 (build 7421159)
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6db7620069 -s ours am: f3ea0dd7c6 am: e9c7c9eb5c

Change-Id: Ie3e6d6791a0847febd4f9a0d3668436112c34ff6