Android NDK r22 Beta 1 (build 6917172)
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 1d67e7fe70 -s ours

am skip reason: subject contains skip directive

Change-Id: I46fd99c03fc5343f91825fca3ccce8ea240539ee