Improve x86 android support, add x86_64 android target