Merge: Support Android on 2 different ARMs, x86 and even MIPS