[FIXED JENKINS-14741] Allow for the x86 ABI for android-10.

Google now host the x86 ABI for android-10 rather than Intel,
in the process making it a proper system-image rather than an
add-on. This caused problems with determining if the configured
AVD required an ABI, so now we add some more special handling
for this case.