Fix non-aarch64 android builds? and build fail for --with-sysmagic