Merge remote-tracking branch 'aosp/upstream-master' into master am: 9307052bcf

Original change: https://android-review.googlesource.com/c/platform/external/capstone/+/1506305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b4a36ee9a2ec88c2f45730871c7c790a61f172c