Merge "Support generating coverage report for Kotlin tests"
diff --git a/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb b/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb
index a721582..50e0cc9 100644
--- a/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb
+++ b/.prebuilt_info/prebuilt_info_common_ddmlib_ddmlib-prebuilt_jar.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "7308957"
+    build_id: "7336052"
     target: "studio_linux"
     source_file: "artifacts/ddmlib.jar"
   }
@@ -9,4 +9,5 @@
   version_group: ""
   git_project: "platform/prebuilts/misc"
   git_branch: "master"
+  transform: TRANSFORM_NONE
 }
diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar
index 95c734e..b2cbfae 100644
--- a/common/ddmlib/ddmlib-prebuilt.jar
+++ b/common/ddmlib/ddmlib-prebuilt.jar
Binary files differ
diff --git a/common/frameworks/Android.bp b/common/frameworks/Android.bp
index 384f3e0..00e4094 100644
--- a/common/frameworks/Android.bp
+++ b/common/frameworks/Android.bp
@@ -20,3 +20,8 @@
     name: "platformprotos",
     jars: ["platformprotos-prebuilt.jar"],
 }
+
+java_import_host {
+    name: "platformtestprotos",
+    jars: ["platformtestprotos-prebuilt.jar"],
+}
diff --git a/common/frameworks/PREBUILT b/common/frameworks/PREBUILT
index 0124b2f..aa8e13b 100644
--- a/common/frameworks/PREBUILT
+++ b/common/frameworks/PREBUILT
@@ -1,9 +1,13 @@
-The object in this prebuilt directory can be built from
+The objects in this prebuilt directory can be built from
 	platform/frameworks/base
-From commit I757f06b69eefe26dbbbaa1bbde1abeca1b6a62f4.
-First AOSP build containing the change is aosp-master@5989172.
 
-Note: Before dropping the platformprotos-prebuilt.jar, please
-run the following command to strip the jar manifest file,
-which causes hidden dependency on jars in the Class-Path.
+platformprotos-prebuilt.jar:
+Built from commit I2e7dd4868abda85d244e73592ff12d688f5c21fc.
+First AOSP build containing the change is aosp-master@7532584.
+
+platformtestprotos-prebuilt.jar:
+Built from change I87e7a73d1160e3cf56a4c013e74989cdc90e1211.
+
+Note: Before dropping the jars, please run the following command to strip the
+jar manifest file, which causes hidden dependency on jars in the Class-Path.
 $ zip -d platformprotos-prebuilt.jar META-INF/MANIFEST.MF
diff --git a/common/frameworks/platformprotos-prebuilt.jar b/common/frameworks/platformprotos-prebuilt.jar
index fc87fd0..6024892 100644
--- a/common/frameworks/platformprotos-prebuilt.jar
+++ b/common/frameworks/platformprotos-prebuilt.jar
Binary files differ
diff --git a/common/frameworks/platformtestprotos-prebuilt.jar b/common/frameworks/platformtestprotos-prebuilt.jar
new file mode 100644
index 0000000..be6ea6c
--- /dev/null
+++ b/common/frameworks/platformtestprotos-prebuilt.jar
Binary files differ
diff --git a/common/incfs/OWNERS b/common/incfs/OWNERS
index ce823cf..645c53c 100644
--- a/common/incfs/OWNERS
+++ b/common/incfs/OWNERS
@@ -3,3 +3,4 @@
 schfan@google.com
 toddke@google.com
 zyy@google.com
+patb@google.com
diff --git a/common/ub-uiautomator/PREBUILT b/common/ub-uiautomator/PREBUILT
index 4a18473..a6b9fc7 100644
--- a/common/ub-uiautomator/PREBUILT
+++ b/common/ub-uiautomator/PREBUILT
@@ -1,8 +1,8 @@
 ub-uiautomator.jar
-	is obtained from ub-support-test@4720804
+	is obtained from ub-support-test (uiautomator-v18-2.1.5-release-no-dep.jar)
 	can be rebuilt from
 		project platform/frameworks/uiautomator
-		revision 1e122aeaafd6421b8f9aa4b378fb728e887552d4
+		revision 4c4c25eb5e399e7e4e8532e2dedd48fa6efa17a6
 
 uiautomator-2.2.0-alpha4.jar
 	is obtained from
diff --git a/common/ub-uiautomator/ub-uiautomator.jar b/common/ub-uiautomator/ub-uiautomator.jar
index a826b1f..b6495c6 100644
--- a/common/ub-uiautomator/ub-uiautomator.jar
+++ b/common/ub-uiautomator/ub-uiautomator.jar
Binary files differ
diff --git a/gdbserver/Android.bp b/gdbserver/Android.bp
deleted file mode 100644
index f0328c0..0000000
--- a/gdbserver/Android.bp
+++ /dev/null
@@ -1,63 +0,0 @@
-package {
-    default_applicable_licenses: ["prebuilts_misc_gdbserver_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "prebuilts_misc_gdbserver_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-GPL",
-        "SPDX-license-identifier-GPL-2.0",
-        "SPDX-license-identifier-LGPL",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-PSF-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
-cc_prebuilt_binary {
-    name: "gdbserver",
-    compile_multilib: "both",
-
-    multilib: {
-        lib64: {
-            suffix: "64",
-        },
-    },
-
-    // These are already stripped, and restripping them just issues diagnostics.
-    strip: {
-        none: true,
-    },
-
-    target: {
-        android_arm: {
-            srcs: ["android-arm/gdbserver"],
-        },
-        android_arm64: {
-            srcs: ["android-arm64/gdbserver64"],
-        },
-        android_x86: {
-            srcs: ["android-x86/gdbserver"],
-        },
-        android_x86_64: {
-            srcs: ["android-x86_64/gdbserver64"],
-        },
-    },
-}
diff --git a/gdbserver/MODULE_LICENSE_GPL b/gdbserver/MODULE_LICENSE_GPL
deleted file mode 100644
index e69de29..0000000
--- a/gdbserver/MODULE_LICENSE_GPL
+++ /dev/null
diff --git a/gdbserver/NOTICE b/gdbserver/NOTICE
deleted file mode 100644
index 8a40de8..0000000
--- a/gdbserver/NOTICE
+++ /dev/null
@@ -1,620 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, 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
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-A. HISTORY OF THE SOFTWARE
-==========================
-
-Python was created in the early 1990s by Guido van Rossum at Stichting
-Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
-as a successor of a language called ABC.  Guido remains Python's
-principal author, although it includes many contributions from others.
-
-In 1995, Guido continued his work on Python at the Corporation for
-National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
-in Reston, Virginia where he released several versions of the
-software.
-
-In May 2000, Guido and the Python core development team moved to
-BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Digital Creations (now Zope
-Corporation, see http://www.zope.com).  In 2001, the Python Software
-Foundation (PSF, see http://www.python.org/psf/) was formed, a
-non-profit organization created specifically to own Python-related
-Intellectual Property.  Zope Corporation is a sponsoring member of
-the PSF.
-
-All Python releases are Open Source (see http://www.opensource.org for
-the Open Source Definition).  Historically, most, but not all, Python
-releases have also been GPL-compatible; the table below summarizes
-the various releases.
-
-    Release         Derived     Year        Owner       GPL-
-                    from                                compatible? (1)
-
-    0.9.0 thru 1.2              1991-1995   CWI         yes
-    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
-    1.6             1.5.2       2000        CNRI        no
-    2.0             1.6         2000        BeOpen.com  no
-    1.6.1           1.6         2001        CNRI        yes (2)
-    2.1             2.0+1.6.1   2001        PSF         no
-    2.0.1           2.0+1.6.1   2001        PSF         yes
-    2.1.1           2.1+2.0.1   2001        PSF         yes
-    2.2             2.1.1       2001        PSF         yes
-    2.1.2           2.1.1       2002        PSF         yes
-    2.1.3           2.1.2       2002        PSF         yes
-    2.2.1           2.2         2002        PSF         yes
-    2.2.2           2.2.1       2002        PSF         yes
-    2.2.3           2.2.2       2003        PSF         yes
-    2.3             2.2.2       2002-2003   PSF         yes
-    2.3.1           2.3         2002-2003   PSF         yes
-    2.3.2           2.3.1       2002-2003   PSF         yes
-    2.3.3           2.3.2       2002-2003   PSF         yes
-    2.3.4           2.3.3       2004        PSF         yes
-    2.3.5           2.3.4       2005        PSF         yes
-    2.4             2.3         2004        PSF         yes
-    2.4.1           2.4         2005        PSF         yes
-    2.4.2           2.4.1       2005        PSF         yes
-    2.4.3           2.4.2       2006        PSF         yes
-    2.4.4           2.4.3       2006        PSF         yes
-    2.5             2.4         2006        PSF         yes
-    2.5.1           2.5         2007        PSF         yes
-    2.5.2           2.5.1       2008        PSF         yes
-    2.5.3           2.5.2       2008        PSF         yes
-    2.6             2.5         2008        PSF         yes
-    2.6.1           2.6         2008        PSF         yes
-    2.6.2           2.6.1       2009        PSF         yes
-    2.6.3           2.6.2       2009        PSF         yes
-    2.6.4           2.6.3       2009        PSF         yes
-    2.6.5           2.6.4       2010        PSF         yes
-    2.7             2.6         2010        PSF         yes
-
-Footnotes:
-
-(1) GPL-compatible doesn't mean that we're distributing Python under
-    the GPL.  All Python licenses, unlike the GPL, let you distribute
-    a modified version without making your changes open source.  The
-    GPL-compatible licenses make it possible to combine Python with
-    other software that is released under the GPL; the others don't.
-
-(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
-    because its license has a choice of law clause.  According to
-    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
-    is "not incompatible" with the GPL.
-
-Thanks to the many outside volunteers who have worked under Guido's
-direction to make these releases possible.
-
-
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
-===============================================================
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby
-grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version,
-provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013 Python Software Foundation; All Rights Reserved" are retained
-in Python alone or in any derivative version prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
--------------------------------------------
-
-BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
-1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization ("Licensee") accessing and otherwise using
-this software in source or binary form and its associated
-documentation ("the Software").
-
-2. Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-3. BeOpen is making the Software available to Licensee on an "AS IS"
-basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-5. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-6. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions.  Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee.  This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party.  As an exception, the "BeOpen Python" logos available at
-http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-7. By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
----------------------------------------
-
-1. This LICENSE AGREEMENT is between the Corporation for National
-Research Initiatives, having an office at 1895 Preston White Drive,
-Reston, VA 20191 ("CNRI"), and the Individual or Organization
-("Licensee") accessing and otherwise using Python 1.6.1 software in
-source or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, CNRI
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python 1.6.1
-alone or in any derivative version, provided, however, that CNRI's
-License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
-1995-2001 Corporation for National Research Initiatives; All Rights
-Reserved" are retained in Python 1.6.1 alone or in any derivative
-version prepared by Licensee.  Alternately, in lieu of CNRI's License
-Agreement, Licensee may substitute the following text (omitting the
-quotes): "Python 1.6.1 is made available subject to the terms and
-conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the Internet using the following
-unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the Internet
-using the following URL: http://hdl.handle.net/1895.22/1013".
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 1.6.1 or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python 1.6.1.
-
-4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
-basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. This License Agreement shall be governed by the federal
-intellectual property law of the United States, including without
-limitation the federal copyright law, and, to the extent such
-U.S. federal law does not apply, by the law of the Commonwealth of
-Virginia, excluding Virginia's conflict of law provisions.
-Notwithstanding the foregoing, with regard to derivative works based
-on Python 1.6.1 that incorporate non-separable material that was
-previously distributed under the GNU General Public License (GPL), the
-law of the Commonwealth of Virginia shall govern this License
-Agreement only as to issues arising under or with respect to
-Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
-License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between CNRI and Licensee.  This
-License Agreement does not grant permission to use CNRI trademarks or
-trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying,
-installing or otherwise using Python 1.6.1, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
-
-        ACCEPT
-
-
-CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
---------------------------------------------------
-
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
-The Netherlands.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/gdbserver/README.txt b/gdbserver/README.txt
deleted file mode 100644
index 1cf21c3..0000000
--- a/gdbserver/README.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The Android platform gdb is built as part of the NDK build, from sources at https://android.googlesource.com/toolchain/gdb/.
-
-To build it, follow the steps at https://android.googlesource.com/platform/ndk/+/master/README.md, and run `python checkbuild.py --module gdbserver`.
-
-The current prebuilt versions are built from the sources described by the manifest xml file next to the binaries.
-
diff --git a/gdbserver/android-arm/gdbserver b/gdbserver/android-arm/gdbserver
deleted file mode 100755
index 3b95f20..0000000
--- a/gdbserver/android-arm/gdbserver
+++ /dev/null
Binary files differ
diff --git a/gdbserver/android-arm/manifest_5947409.xml b/gdbserver/android-arm/manifest_5947409.xml
deleted file mode 100644
index 2889019..0000000
--- a/gdbserver/android-arm/manifest_5947409.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
-
-  <default remote="aosp" revision="master" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="639243dd5cb2c5ea1313f033c75c8c533813a484" />
-
-  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="da4b9cb08341185e002c8a8c5df73533cdb93b41" />
-
-  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="53add29eb7b4eaa9e128e3ec84eac9e65cf4c986" />
-
-  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="58be6006bb71abb97d7cdff7be3e73d55bbc22b8" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" />
-
-  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="9d8e2e019e5013800ee0adfaffc328f61834ca44" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="5e6fd0de6d7bf7e7737daef49d54c8a98ec41c30" />
-
-  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="6371bac034f56bcfe3d6a82a8de44b8905a12986" />
-
-  <project name="platform/external/regex-re2" path="external/regex-re2" revision="84e28962b2c2f357b5daccb460501b169193fafe" />
-
-  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="a9d5e6fb22fe3283eeecfb97211a12c072a7b469" />
-
-  <project groups="presubmit" name="platform/bionic" path="bionic" revision="919dc05d66b129ad6f34fad95322efb6de245754" />
-
-  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="7a28367b72cb1e1667b081d6404afbd063898e70" />
-
-  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" />
-
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="c343ab95990c3b870ede43050881b762d9aafbb6" />
-
-  <project groups="presubmit" name="platform/external/vulkan-tools" path="external/vulkan-tools" revision="75992cfa407810b03676cd144cd3f33c776fd986" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" />
-
-  <project groups="presubmit" name="platform/prebuilts/renderscript/host/linux-x86" path="prebuilts/renderscript/host/linux-x86" revision="68a0a1ddacb81c97d718f46ad464a3851d0b67af" />
-
-  <project name="platform/external/effcee" path="external/effcee" revision="b93cb2bdda93ed98f253b75a59582780c8460cc1" />
-
-  <project name="platform/external/libcxx" path="external/libcxx" revision="8cf87ff8ce9e7c22c9f4d4c63f19b7a324314444" />
-
-  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" />
-
-  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
-
-  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" />
-
-  <project groups="presubmit" name="platform/external/vulkan-headers" path="external/vulkan-headers" revision="ffdba7a3a040b32843d8188c9d7c0f2d77311ba4" />
-
-  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="b3fa2e210e7d170015bebeea5f91be358e87ef33" />
-
-  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="f3bfe547014d2d751b7547ad7847a51b0ea34dc8" />
-
-  <project groups="presubmit" name="toolchain/make" path="toolchain/make" revision="0e5088b737c763044b8d125b5c018b6e75f0c5a9" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="c2885c755bd673681f24fdaf09f2886fbbdc9775" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="e3cfd463c4e720e7bdf50f7d314ffa023695a11f" />
-
-  <project groups="presubmit" name="platform/development" path="development" revision="f45e8c672ac88e4287557d74e4e430f01b1b9c3b" />
-
-  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="4d64623fc5a88a041fbb0ad5f4ad9d65cb0d4b47" />
-
-  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="8f08b1835d6dd123282c612b0702cc0ceb3e2640" />
-
-  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="fe4d48ac0f76147635e65278bededb5aac9ab178" />
-
-  <project name="platform/prebuilts/renderscript/host/darwin-x86" path="prebuilts/renderscript/host/darwin-x86" revision="a0ede5664b4741348c0b6c8d5da06d483dcf2876" />
-
-  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="6f40a53b210eb1743939972b8a7dbdccb606f1f3" />
-
-  <project groups="presubmit" name="platform/ndk" path="ndk" revision="143c872a69380eb6812c1fcaf56b8a4b7f1404ea" />
-
-  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" />
-
-  <project groups="presubmit" name="platform/external/python/cpython3" path="external/python/cpython3" revision="b0e85ca1ed410f0196f20f4c37d16dafd4878a3d" />
-
-  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" />
-
-  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
-
-  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="7f937857faf2ed865a19e83e08ace05c82e82c57" />
-
-  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="40d269730b94b6ddbac03c63cd6d617165ba386f" />
-
-  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" />
-
-  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" />
-
-  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="f4587e26e8fa5ff8532e0428a38f20c677be7fd0" />
-
-  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="a89c9e0f736c4e3f6b3dc618e248ee4e56419c2a" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="3d5e63f5bf6274e7569e9230f8be8371e61df90b" />
-
-  <project name="platform/external/llvm" path="external/llvm" revision="0c3d0c5bf04d62953fd1548ceff7d16a08e02953" />
-
-  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="84f27e750f297cb18a3ddf236ba0223a7078dcdd" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" revision="f909031f48fbd46a3de559603579a386ede0ba12" />
-
-  <project name="platform/prebuilts/renderscript/host/windows-x86" path="prebuilts/renderscript/host/windows-x86" revision="5df9f20565e63906167c82f6120c78e969b3b467" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="d9aafaade740ca38612c742f6d87debf362132ea" />
-
-  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="6028ff28e400196ec54ee22baa2103a11c27d529" />
-
-  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="ac90d9b11e02bd6837917f7e981ed40dc2cb7d1b" />
-
-  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
-
-  <project groups="presubmit" name="platform/prebuilts/simpleperf" path="prebuilts/simpleperf" revision="c463a3e871abac8c4dd17ffdeeb1a66d3abc2fdf" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" />
-
-  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="824aaa36e08b25a648562dc8ba0b2797d85a5153" />
-
-  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="691254d74159549cf5ef8d2a69bb02c062b28a0c" />
-
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="ad7ca83cbab137cda64f8701ba9cda6a766a3197" />
-</manifest>
diff --git a/gdbserver/android-arm64/gdbserver64 b/gdbserver/android-arm64/gdbserver64
deleted file mode 100755
index 1568723..0000000
--- a/gdbserver/android-arm64/gdbserver64
+++ /dev/null
Binary files differ
diff --git a/gdbserver/android-arm64/manifest_5947409.xml b/gdbserver/android-arm64/manifest_5947409.xml
deleted file mode 100644
index 2889019..0000000
--- a/gdbserver/android-arm64/manifest_5947409.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
-
-  <default remote="aosp" revision="master" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="639243dd5cb2c5ea1313f033c75c8c533813a484" />
-
-  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="da4b9cb08341185e002c8a8c5df73533cdb93b41" />
-
-  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="53add29eb7b4eaa9e128e3ec84eac9e65cf4c986" />
-
-  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="58be6006bb71abb97d7cdff7be3e73d55bbc22b8" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" />
-
-  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="9d8e2e019e5013800ee0adfaffc328f61834ca44" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="5e6fd0de6d7bf7e7737daef49d54c8a98ec41c30" />
-
-  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="6371bac034f56bcfe3d6a82a8de44b8905a12986" />
-
-  <project name="platform/external/regex-re2" path="external/regex-re2" revision="84e28962b2c2f357b5daccb460501b169193fafe" />
-
-  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="a9d5e6fb22fe3283eeecfb97211a12c072a7b469" />
-
-  <project groups="presubmit" name="platform/bionic" path="bionic" revision="919dc05d66b129ad6f34fad95322efb6de245754" />
-
-  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="7a28367b72cb1e1667b081d6404afbd063898e70" />
-
-  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" />
-
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="c343ab95990c3b870ede43050881b762d9aafbb6" />
-
-  <project groups="presubmit" name="platform/external/vulkan-tools" path="external/vulkan-tools" revision="75992cfa407810b03676cd144cd3f33c776fd986" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" />
-
-  <project groups="presubmit" name="platform/prebuilts/renderscript/host/linux-x86" path="prebuilts/renderscript/host/linux-x86" revision="68a0a1ddacb81c97d718f46ad464a3851d0b67af" />
-
-  <project name="platform/external/effcee" path="external/effcee" revision="b93cb2bdda93ed98f253b75a59582780c8460cc1" />
-
-  <project name="platform/external/libcxx" path="external/libcxx" revision="8cf87ff8ce9e7c22c9f4d4c63f19b7a324314444" />
-
-  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" />
-
-  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
-
-  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" />
-
-  <project groups="presubmit" name="platform/external/vulkan-headers" path="external/vulkan-headers" revision="ffdba7a3a040b32843d8188c9d7c0f2d77311ba4" />
-
-  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="b3fa2e210e7d170015bebeea5f91be358e87ef33" />
-
-  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="f3bfe547014d2d751b7547ad7847a51b0ea34dc8" />
-
-  <project groups="presubmit" name="toolchain/make" path="toolchain/make" revision="0e5088b737c763044b8d125b5c018b6e75f0c5a9" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="c2885c755bd673681f24fdaf09f2886fbbdc9775" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="e3cfd463c4e720e7bdf50f7d314ffa023695a11f" />
-
-  <project groups="presubmit" name="platform/development" path="development" revision="f45e8c672ac88e4287557d74e4e430f01b1b9c3b" />
-
-  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="4d64623fc5a88a041fbb0ad5f4ad9d65cb0d4b47" />
-
-  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="8f08b1835d6dd123282c612b0702cc0ceb3e2640" />
-
-  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="fe4d48ac0f76147635e65278bededb5aac9ab178" />
-
-  <project name="platform/prebuilts/renderscript/host/darwin-x86" path="prebuilts/renderscript/host/darwin-x86" revision="a0ede5664b4741348c0b6c8d5da06d483dcf2876" />
-
-  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="6f40a53b210eb1743939972b8a7dbdccb606f1f3" />
-
-  <project groups="presubmit" name="platform/ndk" path="ndk" revision="143c872a69380eb6812c1fcaf56b8a4b7f1404ea" />
-
-  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" />
-
-  <project groups="presubmit" name="platform/external/python/cpython3" path="external/python/cpython3" revision="b0e85ca1ed410f0196f20f4c37d16dafd4878a3d" />
-
-  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" />
-
-  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
-
-  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="7f937857faf2ed865a19e83e08ace05c82e82c57" />
-
-  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="40d269730b94b6ddbac03c63cd6d617165ba386f" />
-
-  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" />
-
-  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" />
-
-  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="f4587e26e8fa5ff8532e0428a38f20c677be7fd0" />
-
-  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="a89c9e0f736c4e3f6b3dc618e248ee4e56419c2a" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="3d5e63f5bf6274e7569e9230f8be8371e61df90b" />
-
-  <project name="platform/external/llvm" path="external/llvm" revision="0c3d0c5bf04d62953fd1548ceff7d16a08e02953" />
-
-  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="84f27e750f297cb18a3ddf236ba0223a7078dcdd" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" revision="f909031f48fbd46a3de559603579a386ede0ba12" />
-
-  <project name="platform/prebuilts/renderscript/host/windows-x86" path="prebuilts/renderscript/host/windows-x86" revision="5df9f20565e63906167c82f6120c78e969b3b467" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="d9aafaade740ca38612c742f6d87debf362132ea" />
-
-  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="6028ff28e400196ec54ee22baa2103a11c27d529" />
-
-  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="ac90d9b11e02bd6837917f7e981ed40dc2cb7d1b" />
-
-  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
-
-  <project groups="presubmit" name="platform/prebuilts/simpleperf" path="prebuilts/simpleperf" revision="c463a3e871abac8c4dd17ffdeeb1a66d3abc2fdf" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" />
-
-  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="824aaa36e08b25a648562dc8ba0b2797d85a5153" />
-
-  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="691254d74159549cf5ef8d2a69bb02c062b28a0c" />
-
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="ad7ca83cbab137cda64f8701ba9cda6a766a3197" />
-</manifest>
diff --git a/gdbserver/android-x86/gdbserver b/gdbserver/android-x86/gdbserver
deleted file mode 100755
index f30e8ac..0000000
--- a/gdbserver/android-x86/gdbserver
+++ /dev/null
Binary files differ
diff --git a/gdbserver/android-x86/manifest_5947409.xml b/gdbserver/android-x86/manifest_5947409.xml
deleted file mode 100644
index 2889019..0000000
--- a/gdbserver/android-x86/manifest_5947409.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
-
-  <default remote="aosp" revision="master" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="639243dd5cb2c5ea1313f033c75c8c533813a484" />
-
-  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="da4b9cb08341185e002c8a8c5df73533cdb93b41" />
-
-  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="53add29eb7b4eaa9e128e3ec84eac9e65cf4c986" />
-
-  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="58be6006bb71abb97d7cdff7be3e73d55bbc22b8" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" />
-
-  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="9d8e2e019e5013800ee0adfaffc328f61834ca44" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="5e6fd0de6d7bf7e7737daef49d54c8a98ec41c30" />
-
-  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="6371bac034f56bcfe3d6a82a8de44b8905a12986" />
-
-  <project name="platform/external/regex-re2" path="external/regex-re2" revision="84e28962b2c2f357b5daccb460501b169193fafe" />
-
-  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="a9d5e6fb22fe3283eeecfb97211a12c072a7b469" />
-
-  <project groups="presubmit" name="platform/bionic" path="bionic" revision="919dc05d66b129ad6f34fad95322efb6de245754" />
-
-  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="7a28367b72cb1e1667b081d6404afbd063898e70" />
-
-  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" />
-
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="c343ab95990c3b870ede43050881b762d9aafbb6" />
-
-  <project groups="presubmit" name="platform/external/vulkan-tools" path="external/vulkan-tools" revision="75992cfa407810b03676cd144cd3f33c776fd986" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" />
-
-  <project groups="presubmit" name="platform/prebuilts/renderscript/host/linux-x86" path="prebuilts/renderscript/host/linux-x86" revision="68a0a1ddacb81c97d718f46ad464a3851d0b67af" />
-
-  <project name="platform/external/effcee" path="external/effcee" revision="b93cb2bdda93ed98f253b75a59582780c8460cc1" />
-
-  <project name="platform/external/libcxx" path="external/libcxx" revision="8cf87ff8ce9e7c22c9f4d4c63f19b7a324314444" />
-
-  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" />
-
-  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
-
-  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" />
-
-  <project groups="presubmit" name="platform/external/vulkan-headers" path="external/vulkan-headers" revision="ffdba7a3a040b32843d8188c9d7c0f2d77311ba4" />
-
-  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="b3fa2e210e7d170015bebeea5f91be358e87ef33" />
-
-  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="f3bfe547014d2d751b7547ad7847a51b0ea34dc8" />
-
-  <project groups="presubmit" name="toolchain/make" path="toolchain/make" revision="0e5088b737c763044b8d125b5c018b6e75f0c5a9" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="c2885c755bd673681f24fdaf09f2886fbbdc9775" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="e3cfd463c4e720e7bdf50f7d314ffa023695a11f" />
-
-  <project groups="presubmit" name="platform/development" path="development" revision="f45e8c672ac88e4287557d74e4e430f01b1b9c3b" />
-
-  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="4d64623fc5a88a041fbb0ad5f4ad9d65cb0d4b47" />
-
-  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="8f08b1835d6dd123282c612b0702cc0ceb3e2640" />
-
-  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="fe4d48ac0f76147635e65278bededb5aac9ab178" />
-
-  <project name="platform/prebuilts/renderscript/host/darwin-x86" path="prebuilts/renderscript/host/darwin-x86" revision="a0ede5664b4741348c0b6c8d5da06d483dcf2876" />
-
-  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="6f40a53b210eb1743939972b8a7dbdccb606f1f3" />
-
-  <project groups="presubmit" name="platform/ndk" path="ndk" revision="143c872a69380eb6812c1fcaf56b8a4b7f1404ea" />
-
-  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" />
-
-  <project groups="presubmit" name="platform/external/python/cpython3" path="external/python/cpython3" revision="b0e85ca1ed410f0196f20f4c37d16dafd4878a3d" />
-
-  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" />
-
-  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
-
-  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="7f937857faf2ed865a19e83e08ace05c82e82c57" />
-
-  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="40d269730b94b6ddbac03c63cd6d617165ba386f" />
-
-  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" />
-
-  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" />
-
-  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="f4587e26e8fa5ff8532e0428a38f20c677be7fd0" />
-
-  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="a89c9e0f736c4e3f6b3dc618e248ee4e56419c2a" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="3d5e63f5bf6274e7569e9230f8be8371e61df90b" />
-
-  <project name="platform/external/llvm" path="external/llvm" revision="0c3d0c5bf04d62953fd1548ceff7d16a08e02953" />
-
-  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="84f27e750f297cb18a3ddf236ba0223a7078dcdd" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" revision="f909031f48fbd46a3de559603579a386ede0ba12" />
-
-  <project name="platform/prebuilts/renderscript/host/windows-x86" path="prebuilts/renderscript/host/windows-x86" revision="5df9f20565e63906167c82f6120c78e969b3b467" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="d9aafaade740ca38612c742f6d87debf362132ea" />
-
-  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="6028ff28e400196ec54ee22baa2103a11c27d529" />
-
-  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="ac90d9b11e02bd6837917f7e981ed40dc2cb7d1b" />
-
-  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
-
-  <project groups="presubmit" name="platform/prebuilts/simpleperf" path="prebuilts/simpleperf" revision="c463a3e871abac8c4dd17ffdeeb1a66d3abc2fdf" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" />
-
-  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="824aaa36e08b25a648562dc8ba0b2797d85a5153" />
-
-  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="691254d74159549cf5ef8d2a69bb02c062b28a0c" />
-
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="ad7ca83cbab137cda64f8701ba9cda6a766a3197" />
-</manifest>
diff --git a/gdbserver/android-x86_64/gdbserver64 b/gdbserver/android-x86_64/gdbserver64
deleted file mode 100755
index 05446b1..0000000
--- a/gdbserver/android-x86_64/gdbserver64
+++ /dev/null
Binary files differ
diff --git a/gdbserver/android-x86_64/manifest_5947409.xml b/gdbserver/android-x86_64/manifest_5947409.xml
deleted file mode 100644
index 2889019..0000000
--- a/gdbserver/android-x86_64/manifest_5947409.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
-
-  <default remote="aosp" revision="master" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="639243dd5cb2c5ea1313f033c75c8c533813a484" />
-
-  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="da4b9cb08341185e002c8a8c5df73533cdb93b41" />
-
-  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="53add29eb7b4eaa9e128e3ec84eac9e65cf4c986" />
-
-  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="58be6006bb71abb97d7cdff7be3e73d55bbc22b8" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" />
-
-  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="9d8e2e019e5013800ee0adfaffc328f61834ca44" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="5e6fd0de6d7bf7e7737daef49d54c8a98ec41c30" />
-
-  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="6371bac034f56bcfe3d6a82a8de44b8905a12986" />
-
-  <project name="platform/external/regex-re2" path="external/regex-re2" revision="84e28962b2c2f357b5daccb460501b169193fafe" />
-
-  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="a9d5e6fb22fe3283eeecfb97211a12c072a7b469" />
-
-  <project groups="presubmit" name="platform/bionic" path="bionic" revision="919dc05d66b129ad6f34fad95322efb6de245754" />
-
-  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="7a28367b72cb1e1667b081d6404afbd063898e70" />
-
-  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" />
-
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="c343ab95990c3b870ede43050881b762d9aafbb6" />
-
-  <project groups="presubmit" name="platform/external/vulkan-tools" path="external/vulkan-tools" revision="75992cfa407810b03676cd144cd3f33c776fd986" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" />
-
-  <project groups="presubmit" name="platform/prebuilts/renderscript/host/linux-x86" path="prebuilts/renderscript/host/linux-x86" revision="68a0a1ddacb81c97d718f46ad464a3851d0b67af" />
-
-  <project name="platform/external/effcee" path="external/effcee" revision="b93cb2bdda93ed98f253b75a59582780c8460cc1" />
-
-  <project name="platform/external/libcxx" path="external/libcxx" revision="8cf87ff8ce9e7c22c9f4d4c63f19b7a324314444" />
-
-  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" />
-
-  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
-
-  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" />
-
-  <project groups="presubmit" name="platform/external/vulkan-headers" path="external/vulkan-headers" revision="ffdba7a3a040b32843d8188c9d7c0f2d77311ba4" />
-
-  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="b3fa2e210e7d170015bebeea5f91be358e87ef33" />
-
-  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="f3bfe547014d2d751b7547ad7847a51b0ea34dc8" />
-
-  <project groups="presubmit" name="toolchain/make" path="toolchain/make" revision="0e5088b737c763044b8d125b5c018b6e75f0c5a9" />
-
-  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="c2885c755bd673681f24fdaf09f2886fbbdc9775" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="e3cfd463c4e720e7bdf50f7d314ffa023695a11f" />
-
-  <project groups="presubmit" name="platform/development" path="development" revision="f45e8c672ac88e4287557d74e4e430f01b1b9c3b" />
-
-  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="4d64623fc5a88a041fbb0ad5f4ad9d65cb0d4b47" />
-
-  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="8f08b1835d6dd123282c612b0702cc0ceb3e2640" />
-
-  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="fe4d48ac0f76147635e65278bededb5aac9ab178" />
-
-  <project name="platform/prebuilts/renderscript/host/darwin-x86" path="prebuilts/renderscript/host/darwin-x86" revision="a0ede5664b4741348c0b6c8d5da06d483dcf2876" />
-
-  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="6f40a53b210eb1743939972b8a7dbdccb606f1f3" />
-
-  <project groups="presubmit" name="platform/ndk" path="ndk" revision="143c872a69380eb6812c1fcaf56b8a4b7f1404ea" />
-
-  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" />
-
-  <project groups="presubmit" name="platform/external/python/cpython3" path="external/python/cpython3" revision="b0e85ca1ed410f0196f20f4c37d16dafd4878a3d" />
-
-  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" />
-
-  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
-
-  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="7f937857faf2ed865a19e83e08ace05c82e82c57" />
-
-  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="40d269730b94b6ddbac03c63cd6d617165ba386f" />
-
-  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" />
-
-  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" />
-
-  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="f4587e26e8fa5ff8532e0428a38f20c677be7fd0" />
-
-  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" />
-
-  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="a89c9e0f736c4e3f6b3dc618e248ee4e56419c2a" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="3d5e63f5bf6274e7569e9230f8be8371e61df90b" />
-
-  <project name="platform/external/llvm" path="external/llvm" revision="0c3d0c5bf04d62953fd1548ceff7d16a08e02953" />
-
-  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="84f27e750f297cb18a3ddf236ba0223a7078dcdd" />
-
-  <project groups="presubmit" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" revision="f909031f48fbd46a3de559603579a386ede0ba12" />
-
-  <project name="platform/prebuilts/renderscript/host/windows-x86" path="prebuilts/renderscript/host/windows-x86" revision="5df9f20565e63906167c82f6120c78e969b3b467" />
-
-  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="d9aafaade740ca38612c742f6d87debf362132ea" />
-
-  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="6028ff28e400196ec54ee22baa2103a11c27d529" />
-
-  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="ac90d9b11e02bd6837917f7e981ed40dc2cb7d1b" />
-
-  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
-
-  <project groups="presubmit" name="platform/prebuilts/simpleperf" path="prebuilts/simpleperf" revision="c463a3e871abac8c4dd17ffdeeb1a66d3abc2fdf" />
-
-  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" />
-
-  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="824aaa36e08b25a648562dc8ba0b2797d85a5153" />
-
-  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="691254d74159549cf5ef8d2a69bb02c062b28a0c" />
-
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="ad7ca83cbab137cda64f8701ba9cda6a766a3197" />
-</manifest>
diff --git a/linux-x86/libufdt/BUILD.bazel b/linux-x86/libufdt/BUILD.bazel
new file mode 100644
index 0000000..613bf12
--- /dev/null
+++ b/linux-x86/libufdt/BUILD.bazel
@@ -0,0 +1,9 @@
+# NOTE: THIS FILE IS EXPERIMENTAL FOR THE BAZEL MIGRATION AND NOT USED FOR
+# YOUR BUILDS CURRENTLY.
+#
+# It is not yet the source of truth for your build. If you're looking to modify
+# the build file, modify the Android.bp file instead. Do *not* modify this file
+# unless you have coordinated with the team managing the Soong to Bazel
+# migration.
+
+exports_files(["mkdtimg"])