Merge "Enabling Capstone build for android-x86_64 arch variant"
am: a36873003f

Change-Id: Ic8d51c9f9264c2916b25e0a9d49c5ab017078a66