Android NDK r23 Beta 3 (build 7272597)
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 3eb882505e -s ours am: 3eeb486b55 am: ec2768c05c

Change-Id: Ic74c5b5355e79f8d7ebcf3320affdf1ad7d20f8b