Merge "arm: Support qemu-android on generic arm targets"