diff --git a/arm/LINUX_KERNEL_COPYING b/arm/LINUX_KERNEL_COPYING
new file mode 100644
index 0000000..8460823
--- /dev/null
+++ b/arm/LINUX_KERNEL_COPYING
@@ -0,0 +1,298 @@
+
+The Linux 2.6.x Kernel is licensed as follows:
+
+   NOTE! This copyright does *not* cover user programs that use kernel
+ services by normal system calls - this is merely considered normal use
+ of the kernel, and does *not* fall under the heading of "derived work".
+ Also note that the GPL below is copyrighted by the Free Software
+ Foundation, but the instance of code that it refers to (the Linux
+ kernel) is copyrighted by me and others who actually wrote it.
+
+ Also note that the only valid version of the GPL as far as the kernel
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+			Linus Torvalds
+
+----------------------------------------
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff --git a/arm/README b/arm/README
new file mode 100644
index 0000000..b26da18
--- /dev/null
+++ b/arm/README
@@ -0,0 +1,5 @@
+This directory contains the kernel images specific to the Android emulator.
+They are built with the 'external/qemu/distrib/build-kernel.sh' script.
+
+See external/qemu/docs/ANDROID-KERNEL.TXT for more details.
+
diff --git a/arm/kernel-qemu b/arm/kernel-qemu
new file mode 100755
index 0000000..5b98a65
--- /dev/null
+++ b/arm/kernel-qemu
Binary files differ
diff --git a/arm/kernel-qemu-armv7 b/arm/kernel-qemu-armv7
new file mode 100755
index 0000000..531f5af
--- /dev/null
+++ b/arm/kernel-qemu-armv7
Binary files differ
diff --git a/arm/rebuild.sh b/arm/rebuild.sh
new file mode 100755
index 0000000..6ddc894
--- /dev/null
+++ b/arm/rebuild.sh
@@ -0,0 +1,311 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script is used to rebuild the Android goldfish arm-based kernel from
+# sources.
+
+###
+### Utilities
+###
+
+# Implementation of 'dirname' that works safely when paths contains spaces
+# $1: output variable name
+# $2: path (may contain spaces)
+# Usage: set_dirname FOO "/path/to/foo with spaces"
+set_dirname ()
+{
+    eval $1="`dirname \"$2\"`"
+}
+
+# Same as set_dirname, but for the 'basename' command
+set_basename ()
+{
+    eval $1="`basename \"$2\"`"
+}
+
+# Check the status of the previous command, and print a message and exit
+# if it didn't succeed.
+fail_panic ()
+{
+    if [ $? != 0 ]; then
+        echo "ERROR: $@"
+        exit 1
+    fi
+}
+
+# Send a message to the log. Does nothing if --verbose is not used
+log ()
+{
+    if [ "$VERBOSE" = "yes" ] ; then
+        echo "$@"
+    fi
+}
+
+# Run a comment. Print it to the output first if --verbose is used
+run ()
+{
+    if [ "$VERBOSE" = "yes" ] ; then
+        echo "### COMMAND: $@"
+        $@
+    else
+        $@ >/dev/null 2>&1
+    fi
+}
+
+fail_ifnotdir ()
+{
+    local _dir="$1"
+    if [ ! -d "$_dir" ]; then
+        shift
+        echo "ERROR: $@ ($_dir)"
+        exit 1
+    fi
+}
+
+# Check wether program '$2' is in your path, and set variable $1 to its
+# full path, or to empty otherwise.
+# Example: find_program FOO foo
+#
+# $1: Variable name
+# $2: Program name
+find_program ()
+{
+    local FINDPROG_=`which $2 2>/dev/null`
+    if [ -n "$FINDPROG_" ]; then
+        eval $1="$FINDPROG_";
+    else
+        eval $1=
+    fi
+}
+
+set_dirname  PROGDIR  "$0"
+set_basename PROGNAME "$0"
+
+###
+### Get defaults
+###
+
+# Location of prebuilt kernel images relative to Android top-level
+PREBUILT_KERNEL_DIR="prebuilt/android-arm/kernel"
+
+# Look for top-level Android build source tree if not in environment
+
+if [ -n "$ANDROID_BUILD_TOP" ] ; then
+    OUT_DIR="$ANDROID_BUILD_TOP/$PREBUILT_KERNEL_DIR"
+else
+    OUT_DIR=
+fi
+
+TOOLCHAIN_NAME=arm-eabi-4.4.0
+TOOLCHAIN_PREFIX=arm-eabi
+GCC="$TOOLCHAIN_PREFIX-gcc"
+
+JOBS="`cat /proc/cpuinfo | grep -e "^processor" | wc -l`"
+
+###
+### Parse options
+###
+OPTION_HELP=no
+VERBOSE=no
+VERBOSE2=no
+OPTION_OUT_DIR=
+OPTION_CC=
+
+PARAMS=""
+
+for opt do
+    optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
+    case "$opt" in
+        --help|-h|-\?) OPTION_HELP=yes
+            ;;
+        --verbose)
+            if [ "$VERBOSE" = "yes" ] ; then
+                VERBOSE2=yes
+            else
+                VERBOSE=yes
+            fi
+            ;;
+        --out-dir=*)
+            OPTION_OUT_DIR="$optarg"
+            ;;
+        --cc=*)
+            OPTION_CC="$optarg"
+            ;;
+        --toolchain=*)
+            TOOLCHAIN_NAME="$optarg"
+            ;;
+        --jobs=*)
+            JOBS="$optarg"
+            ;;
+        -*)
+            echo "unknown option '$opt', use --help"
+            exit 1
+            ;;
+        *)
+            if [ -z "$PARAMS" ] ; then
+                PARAMS="$opt"
+            else
+                PARAMS="$PARAMS $opt"
+            fi
+            ;;
+    esac
+done
+
+if [ "$OPTION_HELP" = "yes" ] ; then
+    echo "Usage: $PROGNAME <options> /path/to/kernel"
+    echo ""
+    echo "Rebuild the prebuilt Android goldfish-specific kernel from sources."
+    echo ""
+    echo "Options (default are inside brackets):"
+    echo ""
+    echo "    --help                Print this message."
+    echo "    --verbose             Enable verbose output."
+    echo "    --android=<path>      Set Android top-level directory [$ANDROID_BUILD_TOP]"
+    echo "    --out-dir=<path>      Set output directory [$OUT_DIR]"
+    echo "    --toolchain=<name>    Toolchain name [$TOOLCHAIN_NAME]"
+    echo "    --cc=<path>           Path to C compiler [$GCC]"
+    echo "    --jobs=<count>        Perform <count> parallel builds [$JOBS]"
+    echo ""
+    echo "The --toolchain option is ignored if you use the --cc one."
+    exit 0
+fi
+
+###
+### Parse parameters
+###
+
+set_parameters ()
+{
+    if [ -z "$1" ] ; then
+        echo "ERROR: Please specify path of kernel sources directory. See --help for details."
+        exit 1
+    fi
+    if [ -n "$2" ]; then
+        echo "ERROR: Too many arguments. See --help for details."
+        exit 1
+    fi
+    KERNEL_DIR="$1"
+    fail_ifnotdir "$KERNEL_DIR" "Missing kernel directory"
+    fail_ifnotdir "$KERNEL_DIR/kernel" "Missing kernel-specific directory"
+    fail_ifnotdir "$KERNEL_DIR/arch"   "Missing kernel-specific directory"
+    fail_ifnotdir "$KERNEL_DIR/arch/arm/mach-goldfish" "Missing goldfish-specific directory"
+}
+
+set_parameters $PARAMS
+
+###
+### Determine build configuration
+###
+
+if [ -n "$OPTION_OUT_DIR" ] ; then
+    OUT_DIR="$OPTION_OUT_DIR"
+fi
+
+if [ -z "$ANDROID_BUILD_TOP" ] ; then
+    # Assume that we are under $ANDROID_BUILD_TOP/prebuilt/android-arm/kernel
+    ANDROID_BUILD_TOP="`cd \"$PROGDIR\"/../../.. && pwd`"
+    if [ -d "$ANDROID_BUILD_TOP" ]; then
+        echo "Probed Android top-level directory: $ANDROID_BUILD_TOP"
+    else
+        echo "ERROR: Can't find Android top-leveld directory. Please define ANDROID_BUILD_TOP"
+        exit 1
+    fi
+fi
+
+if [ -z "$OUT_DIR" ] ; then
+    OUT_DIR="$ANDROID_BUILD_TOP/$PREBUILT_KERNEL_DIR"
+    if [ ! -d "$OUT_DIR" ]; then
+        echo "ERROR: Missing default output dir: $OUT_DIR"
+        echo "Please use --out-dir=<path> to specify alternative output directory."
+        exit 1
+    fi
+fi
+
+echo "Using output directory: $OUT_DIR"
+mkdir -p "$OUT_DIR"
+fail_panic "Could not create directory: $OUT_DIR"
+
+# Find toolchain
+
+if [ -n "$OPTION_CC" ]; then
+    GCC="$OPTION_CC"
+else
+    find_program GCC $TOOLCHAIN_PREFIX-gcc
+fi
+
+if [ -z "$GCC" ]; then
+    TOOLCHAIN_DIR="$ANDROID_BUILD_TOP/prebuilt/linux-x86/toolchain/$TOOLCHAIN_NAME/bin"
+    if [ ! -d "$TOOLCHAIN_DIR" ] ; then
+        echo "ERROR: Missing directory: $TOOLCHAIN_DIR"
+        exit 1
+    fi
+    GCC="$TOOLCHAIN_DIR/$TOOLCHAIN_PREFIX-gcc"
+    if [ ! -f "$GCC" ] ; then
+        echo "ERROR: Missing program file: $GCC"
+        exit 1
+    fi
+fi
+
+CROSS_COMPILE="`echo $GCC | sed -e 's!gcc$!!g' `"
+echo "Using cross-toolchain prefix: $CROSS_COMPILE"
+
+# Do we have ccache in our path?
+find_program CCACHE ccache
+if [ -n "$CCACHE" ]; then
+    echo "Using ccache program: $CCACHE"
+    CROSS_COMPILE="ccache $CROSS_COMPILE"
+fi
+
+###
+### Do the build
+###
+
+cd "$KERNEL_DIR"
+ARCH=arm
+SUBARCH=arm
+
+export CROSS_COMPILE ARCH SUBARCH
+
+# $1: defconfig name (e.g. goldfish or goldfish_armv7)
+# $2: output suffix (e.g. "" or "-armv7")
+do_build ()
+{
+    MAKE_FLAGS="-j$JOBS"
+    # Use --verbose --verbose to see build commands
+    if [ "$VERBOSE2" = "yes" ] ; then
+        MAKE_FLAGS="$MAKE_FLAGS V=1"
+    fi
+    echo "Cleaning up source tree."
+    git ls-files -o | xargs rm -f
+    echo "Setting up $1_defconfig..."
+    run make $1_defconfig
+    fail_panic "Could not setup $1_defconfig build!"
+    echo "Building $1_deconfig..."
+    run make $MAKE_FLAGS
+    fail_panic "Could not build $1_defconfig!"
+    echo "Copying $1_defconfig binaries to $OUT_DIR."
+    cp -f arch/arm/boot/zImage "$OUT_DIR/kernel-qemu$2"
+    cp -f vmlinux "$OUT_DIR/vmlinux-qemu$2"
+}
+
+do_build goldfish
+if [ -f arch/arm/configs/goldfish_armv7_defconfig ]; then
+    do_build goldfish_armv7 -armv7
+fi
+
+echo "Done."
+exit 0
diff --git a/arm/vmlinux-qemu b/arm/vmlinux-qemu
new file mode 100755
index 0000000..185b65d
--- /dev/null
+++ b/arm/vmlinux-qemu
Binary files differ
diff --git a/arm/vmlinux-qemu-armv7 b/arm/vmlinux-qemu-armv7
new file mode 100755
index 0000000..34740d7
--- /dev/null
+++ b/arm/vmlinux-qemu-armv7
Binary files differ
diff --git a/x86/LINUX_KERNEL_COPYING b/x86/LINUX_KERNEL_COPYING
new file mode 100644
index 0000000..8460823
--- /dev/null
+++ b/x86/LINUX_KERNEL_COPYING
@@ -0,0 +1,298 @@
+
+The Linux 2.6.x Kernel is licensed as follows:
+
+   NOTE! This copyright does *not* cover user programs that use kernel
+ services by normal system calls - this is merely considered normal use
+ of the kernel, and does *not* fall under the heading of "derived work".
+ Also note that the GPL below is copyrighted by the Free Software
+ Foundation, but the instance of code that it refers to (the Linux
+ kernel) is copyrighted by me and others who actually wrote it.
+
+ Also note that the only valid version of the GPL as far as the kernel
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+			Linus Torvalds
+
+----------------------------------------
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
diff --git a/x86/README b/x86/README
new file mode 100644
index 0000000..b26da18
--- /dev/null
+++ b/x86/README
@@ -0,0 +1,5 @@
+This directory contains the kernel images specific to the Android emulator.
+They are built with the 'external/qemu/distrib/build-kernel.sh' script.
+
+See external/qemu/docs/ANDROID-KERNEL.TXT for more details.
+
diff --git a/x86/kernel-qemu b/x86/kernel-qemu
new file mode 100644
index 0000000..a8e6277
--- /dev/null
+++ b/x86/kernel-qemu
Binary files differ
diff --git a/x86/kernel-vbox b/x86/kernel-vbox
new file mode 100644
index 0000000..21323e4
--- /dev/null
+++ b/x86/kernel-vbox
Binary files differ
diff --git a/x86/vmlinux-qemu b/x86/vmlinux-qemu
new file mode 100755
index 0000000..d0c1a4d
--- /dev/null
+++ b/x86/vmlinux-qemu
Binary files differ
diff --git a/x86/vmlinux-vbox b/x86/vmlinux-vbox
new file mode 100755
index 0000000..ca40c99
--- /dev/null
+++ b/x86/vmlinux-vbox
Binary files differ