Merge external/qemu-android into external/qemu
Now that nearly everything was moved under android/, it is
possible to merge the QEMU2 source tree into external/qemu.
The end result is a git repository that contains both QEMU1
and QEMU2 sources at the same time, simplifying development
(i.e. code-reviews, branch and release management, bisecting).
This was done by doing the following:
1) Perform the merge:
git remote add \
git fetch aosp-qemu-android
git merge aosp-qemu-android/emu-master-dev -X ours
2) Update documentation and build scripts
Replacing external/qemu-android/ with external/qemu/
and /../qemu-android with . whenever needed.
3) Update android/docs/DEVELOPMENT.TXT to better describe the
directories containing the emulator sources.