Merge "Enabling Capstone build for android-x86_64 arch variant"