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

Change-Id: I666354f7dbb0040c744a46e38ef7d1422ce429f4