diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index 42305ded3..fe0f6267e 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -49,7 +49,7 @@ jobs:
         cp Dockerfile.openpilot_base $STRIPPED_DIR
 
         # need this to build on x86
-        cp -pR --parents phonelibs/libyuv phonelibs/snpe selfdrive/modeld/runners $STRIPPED_DIR
+        cp -pR --parents third_party/libyuv third_party/snpe selfdrive/modeld/runners $STRIPPED_DIR
     - name: Build Docker image
       run: eval "$BUILD"
     - name: Build openpilot and run checks
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 854cff678..78e92685f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
         entry: cppcheck
         language: system
         types: [c++]
-        exclude: '^(phonelibs)|(pyextra)|(cereal)|(opendbc)|(panda)|(tools)|(selfdrive/modeld/thneed/debug)|(selfdrive/modeld/test)|(selfdrive/camerad/test)/|(installer)'
+        exclude: '^(third_party)|(pyextra)|(cereal)|(opendbc)|(panda)|(tools)|(selfdrive/modeld/thneed/debug)|(selfdrive/modeld/test)|(selfdrive/camerad/test)/|(installer)'
         args:
         - --error-exitcode=1
         - --language=c++
diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
index e39ac00ef..df132e604 100644
--- a/Dockerfile.openpilot
+++ b/Dockerfile.openpilot
@@ -16,7 +16,7 @@ RUN pip install --no-cache-dir pipenv==2020.8.13 && \
 COPY SConstruct ${OPENPILOT_PATH}
 
 COPY ./pyextra ${OPENPILOT_PATH}/pyextra
-COPY ./phonelibs ${OPENPILOT_PATH}/phonelibs
+COPY ./third_party ${OPENPILOT_PATH}/third_party
 COPY ./site_scons ${OPENPILOT_PATH}/site_scons
 COPY ./laika ${OPENPILOT_PATH}/laika
 COPY ./laika_repo ${OPENPILOT_PATH}/laika_repo
diff --git a/README.md b/README.md
index 70e8d4f6b..66d9866fa 100755
--- a/README.md
+++ b/README.md
@@ -97,8 +97,8 @@ Directory Structure
     ├── docs                # Documentation
     ├── opendbc             # Files showing how to interpret data from cars
     ├── panda               # Code used to communicate on CAN
-    ├── phonelibs           # External libraries
-    ├── pyextra             # Extra python packages not shipped in NEOS
+    ├── third_party         # External libraries
+    ├── pyextra             # Extra python packages
     └── selfdrive           # Code needed to drive the car
         ├── assets          # Fonts, images, and sounds for UI
         ├── athena          # Allows communication with the app
diff --git a/SConstruct b/SConstruct
index 0e06df62f..18c8d2f12 100644
--- a/SConstruct
+++ b/SConstruct
@@ -64,11 +64,11 @@ USE_FRAME_STREAM = os.getenv("USE_FRAME_STREAM") is not None
 
 lenv = {
   "PATH": os.environ['PATH'],
-  "LD_LIBRARY_PATH": [Dir(f"#phonelibs/acados/{arch}/lib").abspath],
+  "LD_LIBRARY_PATH": [Dir(f"#third_party/acados/{arch}/lib").abspath],
   "PYTHONPATH": Dir("#").abspath + ":" + Dir("#pyextra/").abspath,
 
-  "ACADOS_SOURCE_DIR": Dir("#phonelibs/acados/acados").abspath,
-  "TERA_PATH": Dir("#").abspath + f"/phonelibs/acados/{arch}/t_renderer",
+  "ACADOS_SOURCE_DIR": Dir("#third_party/acados/acados").abspath,
+  "TERA_PATH": Dir("#").abspath + f"/third_party/acados/{arch}/t_renderer",
 }
 
 rpath = lenv["LD_LIBRARY_PATH"].copy()
@@ -82,7 +82,7 @@ if arch == "aarch64" or arch == "larch64":
     lenv["ANDROID_ROOT"] = os.environ['ANDROID_ROOT']
 
   cpppath = [
-    "#phonelibs/opencl/include",
+    "#third_party/opencl/include",
   ]
 
   libpath = [
@@ -90,14 +90,14 @@ if arch == "aarch64" or arch == "larch64":
     "/usr/lib",
     "/system/vendor/lib64",
     "/system/comma/usr/lib",
-    "#phonelibs/nanovg",
-    f"#phonelibs/acados/{arch}/lib",
+    "#third_party/nanovg",
+    f"#third_party/acados/{arch}/lib",
   ]
 
   if arch == "larch64":
     libpath += [
-      "#phonelibs/snpe/larch64",
-      "#phonelibs/libyuv/larch64/lib",
+      "#third_party/snpe/larch64",
+      "#third_party/libyuv/larch64/lib",
       "/usr/lib/aarch64-linux-gnu"
     ]
     cpppath += [
@@ -109,8 +109,8 @@ if arch == "aarch64" or arch == "larch64":
   else:
     rpath = []
     libpath += [
-      "#phonelibs/snpe/aarch64",
-      "#phonelibs/libyuv/lib",
+      "#third_party/snpe/aarch64",
+      "#third_party/libyuv/lib",
       "/system/vendor/lib64"
     ]
     cflags = ["-DQCOM", "-D_USING_LIBCXX", "-mcpu=cortex-a57"]
@@ -123,7 +123,7 @@ else:
   if arch == "Darwin":
     yuv_dir = "mac" if real_arch != "arm64" else "mac_arm64"
     libpath = [
-      f"#phonelibs/libyuv/{yuv_dir}/lib",
+      f"#third_party/libyuv/{yuv_dir}/lib",
       "/usr/local/lib",
       "/opt/homebrew/lib",
       "/usr/local/opt/openssl/lib",
@@ -139,10 +139,10 @@ else:
     ]
   else:
     libpath = [
-      "#phonelibs/acados/x86_64/lib",
-      "#phonelibs/snpe/x86_64-linux-clang",
-      "#phonelibs/libyuv/x64/lib",
-      "#phonelibs/mapbox-gl-native-qt/x86_64",
+      "#third_party/acados/x86_64/lib",
+      "#third_party/snpe/x86_64-linux-clang",
+      "#third_party/libyuv/x64/lib",
+      "#third_party/mapbox-gl-native-qt/x86_64",
       "#cereal",
       "#selfdrive/common",
       "/usr/lib",
@@ -150,7 +150,7 @@ else:
     ]
 
   rpath += [
-    Dir("#phonelibs/snpe/x86_64-linux-clang").abspath,
+    Dir("#third_party/snpe/x86_64-linux-clang").abspath,
     Dir("#cereal").abspath,
     Dir("#selfdrive/common").abspath
   ]
@@ -191,25 +191,25 @@ env = Environment(
 
   CPPPATH=cpppath + [
     "#",
-    "#phonelibs/acados/include",
-    "#phonelibs/acados/include/blasfeo/include",
-    "#phonelibs/acados/include/hpipm/include",
-    "#phonelibs/catch2/include",
-    "#phonelibs/bzip2",
-    "#phonelibs/libyuv/include",
-    "#phonelibs/openmax/include",
-    "#phonelibs/json11",
-    "#phonelibs/curl/include",
-    "#phonelibs/libgralloc/include",
-    "#phonelibs/android_frameworks_native/include",
-    "#phonelibs/android_hardware_libhardware/include",
-    "#phonelibs/android_system_core/include",
-    "#phonelibs/linux/include",
-    "#phonelibs/snpe/include",
-    "#phonelibs/mapbox-gl-native-qt/include",
-    "#phonelibs/nanovg",
-    "#phonelibs/qrcode",
-    "#phonelibs",
+    "#third_party/acados/include",
+    "#third_party/acados/include/blasfeo/include",
+    "#third_party/acados/include/hpipm/include",
+    "#third_party/catch2/include",
+    "#third_party/bzip2",
+    "#third_party/libyuv/include",
+    "#third_party/openmax/include",
+    "#third_party/json11",
+    "#third_party/curl/include",
+    "#third_party/libgralloc/include",
+    "#third_party/android_frameworks_native/include",
+    "#third_party/android_hardware_libhardware/include",
+    "#third_party/android_system_core/include",
+    "#third_party/linux/include",
+    "#third_party/snpe/include",
+    "#third_party/mapbox-gl-native-qt/include",
+    "#third_party/nanovg",
+    "#third_party/qrcode",
+    "#third_party",
     "#cereal",
     "#opendbc/can",
   ],
@@ -224,7 +224,7 @@ env = Environment(
   CXXFLAGS=["-std=c++1z"] + cxxflags,
   LIBPATH=libpath + [
     "#cereal",
-    "#phonelibs",
+    "#third_party",
     "#opendbc/can",
     "#selfdrive/boardd",
     "#selfdrive/common",
@@ -403,7 +403,7 @@ SConscript(['cereal/SConscript'])
 SConscript(['panda/board/SConscript'])
 SConscript(['opendbc/can/SConscript'])
 
-SConscript(['phonelibs/SConscript'])
+SConscript(['third_party/SConscript'])
 
 SConscript(['common/SConscript'])
 SConscript(['common/kalman/SConscript'])
diff --git a/lgtm.yml b/lgtm.yml
index 22ef981fb..6ce935356 100644
--- a/lgtm.yml
+++ b/lgtm.yml
@@ -1,7 +1,7 @@
 path_classifiers:
   library:
     - external
-    - phonelibs
+    - third_party
     - pyextra
     - tools/lib/mkvparse
 extraction:
diff --git a/release/build_release2.sh b/release/build_release2.sh
index c607aa820..f7b22792d 100755
--- a/release/build_release2.sh
+++ b/release/build_release2.sh
@@ -77,8 +77,8 @@ rm models/supercombo.dlc
 mkdir -p panda/board/obj
 mv /tmp/panda.bin.signed panda/board/obj/panda.bin.signed
 
-# Restore phonelibs
-git checkout phonelibs/
+# Restore third_party
+git checkout third_party/
 
 # Mark as prebuilt release
 touch prebuilt
diff --git a/release/build_release3.sh b/release/build_release3.sh
index 37cea5204..681bc48bb 100755
--- a/release/build_release3.sh
+++ b/release/build_release3.sh
@@ -68,8 +68,8 @@ rm models/supercombo.dlc
 mkdir -p panda/board/obj
 mv /tmp/panda.bin.signed panda/board/obj/panda.bin.signed
 
-# Restore phonelibs
-git checkout phonelibs/
+# Restore third_party
+git checkout third_party/
 
 # Mark as prebuilt release
 touch prebuilt
diff --git a/release/files_common b/release/files_common
index fa5d1067d..68c2600c2 100644
--- a/release/files_common
+++ b/release/files_common
@@ -433,44 +433,44 @@ selfdrive/assets/offroad/*
 selfdrive/assets/sounds/*
 selfdrive/assets/training/*
 
-phonelibs/SConscript
+third_party/SConscript
 
-phonelibs/nanovg/*.c
-phonelibs/nanovg/*.h
+third_party/nanovg/*.c
+third_party/nanovg/*.h
 
-phonelibs/libgralloc/**
-phonelibs/linux/**
-phonelibs/opencl/**
-phonelibs/zlib/*
-phonelibs/bzip2/*
-phonelibs/openmax/**
+third_party/libgralloc/**
+third_party/linux/**
+third_party/opencl/**
+third_party/zlib/*
+third_party/bzip2/*
+third_party/openmax/**
 
-phonelibs/json11/json11.cpp
-phonelibs/json11/json11.hpp
+third_party/json11/json11.cpp
+third_party/json11/json11.hpp
 
-phonelibs/qrcode/*.cc
-phonelibs/qrcode/*.hpp
+third_party/qrcode/*.cc
+third_party/qrcode/*.hpp
 
-phonelibs/kaitai/*.h
-phonelibs/kaitai/*.cpp
+third_party/kaitai/*.h
+third_party/kaitai/*.cpp
 
-phonelibs/libyuv/include/**
-phonelibs/libyuv/lib/**
-phonelibs/libyuv/larch64/**
+third_party/libyuv/include/**
+third_party/libyuv/lib/**
+third_party/libyuv/larch64/**
 
-phonelibs/snpe/include/**
-phonelibs/snpe/aarch64**
-phonelibs/snpe/larch64**
-phonelibs/snpe/dsp**
+third_party/snpe/include/**
+third_party/snpe/aarch64**
+third_party/snpe/larch64**
+third_party/snpe/dsp**
 
-phonelibs/acados/x86_64/**
-phonelibs/acados/aarch64/**
-phonelibs/acados/larch64/**
-phonelibs/acados/include/**
+third_party/acados/x86_64/**
+third_party/acados/aarch64/**
+third_party/acados/larch64/**
+third_party/acados/include/**
 
-phonelibs/android_frameworks_native/**
-phonelibs/android_hardware_libhardware/**
-phonelibs/android_system_core/**
+third_party/android_frameworks_native/**
+third_party/android_hardware_libhardware/**
+third_party/android_system_core/**
 
 scripts/update_now.sh
 scripts/stop_updater.sh
diff --git a/release/files_pc b/release/files_pc
index 1b57f97a7..2f55599c2 100644
--- a/release/files_pc
+++ b/release/files_pc
@@ -1,3 +1,3 @@
-phonelibs/mapbox-gl-native-qt/x86_64/**
+third_party/mapbox-gl-native-qt/x86_64/**
 
-phonelibs/qt-plugins/x86_64/**
+third_party/qt-plugins/x86_64/**
diff --git a/release/files_tici b/release/files_tici
index cf5184a58..b5a2e5b7a 100644
--- a/release/files_tici
+++ b/release/files_tici
@@ -1,4 +1,4 @@
-phonelibs/mapbox-gl-native-qt/include/*
+third_party/mapbox-gl-native-qt/include/*
 
 selfdrive/timezoned.py
 
diff --git a/selfdrive/hardware/eon/updater b/selfdrive/hardware/eon/updater
index ff44c7251..eaf34e957 100755
Binary files a/selfdrive/hardware/eon/updater and b/selfdrive/hardware/eon/updater differ
diff --git a/selfdrive/hardware/tici/updater b/selfdrive/hardware/tici/updater
index e3442d59d..1c5775120 100755
Binary files a/selfdrive/hardware/tici/updater and b/selfdrive/hardware/tici/updater differ
diff --git a/selfdrive/modeld/dmonitoringmodeld b/selfdrive/modeld/dmonitoringmodeld
index 506f73163..9acd7bcc3 100755
--- a/selfdrive/modeld/dmonitoringmodeld
+++ b/selfdrive/modeld/dmonitoringmodeld
@@ -5,13 +5,13 @@ cd $DIR
 
 if [ -d /system ]; then
   if [ -f /TICI ]; then # QCOM2
-    export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/phonelibs/snpe/larch64:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/third_party/snpe/larch64:$LD_LIBRARY_PATH"
   else # QCOM
-    export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="/data/pythonpath/third_party/snpe/aarch64/:$LD_LIBRARY_PATH"
   fi
-  export ADSP_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/dsp/"
+  export ADSP_LIBRARY_PATH="/data/pythonpath/third_party/snpe/dsp/"
 else
   # PC
-  export LD_LIBRARY_PATH="$DIR/../../phonelibs/snpe/x86_64-linux-clang:$DIR/../../openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH"
+  export LD_LIBRARY_PATH="$DIR/../../third_party/snpe/x86_64-linux-clang:$DIR/../../openpilot/third_party/snpe/x86_64:$LD_LIBRARY_PATH"
 fi
 exec ./_dmonitoringmodeld
diff --git a/selfdrive/modeld/modeld b/selfdrive/modeld/modeld
index f3a7c2408..fcf2812cb 100755
--- a/selfdrive/modeld/modeld
+++ b/selfdrive/modeld/modeld
@@ -5,12 +5,12 @@ cd $DIR
 
 if [ -d /system ]; then
   if [ -f /TICI ]; then # QCOM2
-    export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/phonelibs/snpe/larch64:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu:/data/pythonpath/third_party/snpe/larch64:$LD_LIBRARY_PATH"
   else # QCOM
-    export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="/data/pythonpath/third_party/snpe/aarch64/:$LD_LIBRARY_PATH"
   fi
 else
   # PC
-  export LD_LIBRARY_PATH="$DIR/../../phonelibs/snpe/x86_64-linux-clang:$DIR/../../openpilot/phonelibs/snpe/x86_64:$LD_LIBRARY_PATH"
+  export LD_LIBRARY_PATH="$DIR/../../third_party/snpe/x86_64-linux-clang:$DIR/../../openpilot/third_party/snpe/x86_64:$LD_LIBRARY_PATH"
 fi
 exec ./_modeld
diff --git a/selfdrive/modeld/test/snpe_benchmark/benchmark.sh b/selfdrive/modeld/test/snpe_benchmark/benchmark.sh
index e87da7db4..a9d3f7978 100755
--- a/selfdrive/modeld/test/snpe_benchmark/benchmark.sh
+++ b/selfdrive/modeld/test/snpe_benchmark/benchmark.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-clang++ -I /data/openpilot/phonelibs/snpe/include/ -L/data/pythonpath/phonelibs/snpe/aarch64 -lSNPE benchmark.cc -o benchmark
-export LD_LIBRARY_PATH="/data/pythonpath/phonelibs/snpe/aarch64/:$HOME/openpilot/phonelibs/snpe/x86_64/:$LD_LIBRARY_PATH"
+clang++ -I /data/openpilot/third_party/snpe/include/ -L/data/pythonpath/third_party/snpe/aarch64 -lSNPE benchmark.cc -o benchmark
+export LD_LIBRARY_PATH="/data/pythonpath/third_party/snpe/aarch64/:$HOME/openpilot/third_party/snpe/x86_64/:$LD_LIBRARY_PATH"
 exec ./benchmark $1
diff --git a/selfdrive/modeld/visiontest.mk b/selfdrive/modeld/visiontest.mk
index 82c6798ff..1df504e93 100644
--- a/selfdrive/modeld/visiontest.mk
+++ b/selfdrive/modeld/visiontest.mk
@@ -10,7 +10,7 @@ ifeq ($(UNAME_S),Darwin)
 	SHARED_FLAGS=-Wl,-force_load $^
 endif
 
-PHONELIBS := ../../phonelibs
+PHONELIBS := ../../third_party
 BASEDIR := ../..
 
 WARN_FLAGS = -Werror=implicit-function-declaration \
diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
index ca8147ec8..7816beb03 100644
--- a/selfdrive/ui/SConscript
+++ b/selfdrive/ui/SConscript
@@ -11,7 +11,7 @@ if arch == 'aarch64':
   base_libs += ['log', 'utils', 'gui', 'ui', 'CB', 'gsl', 'adreno_utils', 'cutils', 'uuid']
 
 if maps and arch == 'x86_64':
-  rpath = [Dir(f"#phonelibs/mapbox-gl-native-qt/{arch}").srcnode().abspath]
+  rpath = [Dir(f"#third_party/mapbox-gl-native-qt/{arch}").srcnode().abspath]
   qt_env["RPATH"] += rpath
 
 if arch == "Darwin":
@@ -21,7 +21,7 @@ if arch == "Darwin":
 widgets_src = ["qt/util.cc", "qt/widgets/input.cc", "qt/widgets/drive_stats.cc",
                "qt/widgets/ssh_keys.cc", "qt/widgets/toggle.cc", "qt/widgets/controls.cc",
                "qt/widgets/offroad_alerts.cc", "qt/widgets/prime.cc", "qt/widgets/keyboard.cc",
-               "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#phonelibs/qrcode/QrCode.cc", "qt/api.cc",
+               "qt/widgets/scrollview.cc", "qt/widgets/cameraview.cc", "#third_party/qrcode/QrCode.cc", "qt/api.cc",
                "qt/request_repeater.cc"]
 
 if arch != 'aarch64':
@@ -54,7 +54,7 @@ qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
 qt_src = ["main.cc", "ui.cc", "paint.cc", "qt/sidebar.cc", "qt/onroad.cc",
           "qt/window.cc", "qt/home.cc", "qt/offroad/settings.cc",
           "qt/offroad/onboarding.cc", "qt/offroad/driverview.cc",
-          "#phonelibs/nanovg/nanovg.c"]
+          "#third_party/nanovg/nanovg.c"]
 qt_env.Program("_ui", qt_src + [asset_obj], LIBS=qt_libs)
 
 
diff --git a/selfdrive/ui/qt/spinner_aarch64 b/selfdrive/ui/qt/spinner_aarch64
index 77c13d81e..71a52bc9f 100755
Binary files a/selfdrive/ui/qt/spinner_aarch64 and b/selfdrive/ui/qt/spinner_aarch64 differ
diff --git a/selfdrive/ui/qt/spinner_larch64 b/selfdrive/ui/qt/spinner_larch64
index fa39f0ed5..645bc4430 100755
Binary files a/selfdrive/ui/qt/spinner_larch64 and b/selfdrive/ui/qt/spinner_larch64 differ
diff --git a/selfdrive/ui/qt/text_aarch64 b/selfdrive/ui/qt/text_aarch64
index f4f770afd..dbce56d59 100755
Binary files a/selfdrive/ui/qt/text_aarch64 and b/selfdrive/ui/qt/text_aarch64 differ
diff --git a/selfdrive/ui/qt/text_larch64 b/selfdrive/ui/qt/text_larch64
index bdfa10daf..eb0f535bf 100755
Binary files a/selfdrive/ui/qt/text_larch64 and b/selfdrive/ui/qt/text_larch64 differ
diff --git a/selfdrive/ui/ui b/selfdrive/ui/ui
index 36341a7ee..68c8c2cad 100755
--- a/selfdrive/ui/ui
+++ b/selfdrive/ui/ui
@@ -1,5 +1,5 @@
 #!/bin/sh
 cd "$(dirname "$0")"
 export LD_LIBRARY_PATH="/system/lib64:$LD_LIBRARY_PATH"
-export QT_PLUGIN_PATH="../../phonelibs/qt-plugins/$(uname -m)"
+export QT_PLUGIN_PATH="../../third_party/qt-plugins/$(uname -m)"
 exec ./_ui
diff --git a/phonelibs/SConscript b/third_party/SConscript
similarity index 100%
rename from phonelibs/SConscript
rename to third_party/SConscript
diff --git a/phonelibs/acados/.gitignore b/third_party/acados/.gitignore
similarity index 100%
rename from phonelibs/acados/.gitignore
rename to third_party/acados/.gitignore
diff --git a/phonelibs/acados/aarch64/lib/libacados.so b/third_party/acados/aarch64/lib/libacados.so
similarity index 75%
rename from phonelibs/acados/aarch64/lib/libacados.so
rename to third_party/acados/aarch64/lib/libacados.so
index 71524a065..3af5fb08f 100755
Binary files a/phonelibs/acados/aarch64/lib/libacados.so and b/third_party/acados/aarch64/lib/libacados.so differ
diff --git a/phonelibs/acados/aarch64/lib/libblasfeo.so b/third_party/acados/aarch64/lib/libblasfeo.so
similarity index 99%
rename from phonelibs/acados/aarch64/lib/libblasfeo.so
rename to third_party/acados/aarch64/lib/libblasfeo.so
index 9dbd58227..38cfb0e9e 100755
Binary files a/phonelibs/acados/aarch64/lib/libblasfeo.so and b/third_party/acados/aarch64/lib/libblasfeo.so differ
diff --git a/phonelibs/acados/aarch64/lib/libhpipm.so b/third_party/acados/aarch64/lib/libhpipm.so
similarity index 99%
rename from phonelibs/acados/aarch64/lib/libhpipm.so
rename to third_party/acados/aarch64/lib/libhpipm.so
index 7b087fe4a..fa7eae088 100755
Binary files a/phonelibs/acados/aarch64/lib/libhpipm.so and b/third_party/acados/aarch64/lib/libhpipm.so differ
diff --git a/phonelibs/acados/aarch64/lib/libqpOASES_e.so b/third_party/acados/aarch64/lib/libqpOASES_e.so
similarity index 100%
rename from phonelibs/acados/aarch64/lib/libqpOASES_e.so
rename to third_party/acados/aarch64/lib/libqpOASES_e.so
diff --git a/phonelibs/acados/aarch64/lib/libqpOASES_e.so.3.1 b/third_party/acados/aarch64/lib/libqpOASES_e.so.3.1
similarity index 83%
rename from phonelibs/acados/aarch64/lib/libqpOASES_e.so.3.1
rename to third_party/acados/aarch64/lib/libqpOASES_e.so.3.1
index 5a0f76097..98d8dbfcd 100755
Binary files a/phonelibs/acados/aarch64/lib/libqpOASES_e.so.3.1 and b/third_party/acados/aarch64/lib/libqpOASES_e.so.3.1 differ
diff --git a/phonelibs/acados/aarch64/t_renderer b/third_party/acados/aarch64/t_renderer
similarity index 100%
rename from phonelibs/acados/aarch64/t_renderer
rename to third_party/acados/aarch64/t_renderer
diff --git a/phonelibs/acados/build.sh b/third_party/acados/build.sh
similarity index 100%
rename from phonelibs/acados/build.sh
rename to third_party/acados/build.sh
diff --git a/phonelibs/acados/include/acados/dense_qp/dense_qp_common.h b/third_party/acados/include/acados/dense_qp/dense_qp_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/dense_qp/dense_qp_common.h
rename to third_party/acados/include/acados/dense_qp/dense_qp_common.h
diff --git a/phonelibs/acados/include/acados/dense_qp/dense_qp_hpipm.h b/third_party/acados/include/acados/dense_qp/dense_qp_hpipm.h
similarity index 100%
rename from phonelibs/acados/include/acados/dense_qp/dense_qp_hpipm.h
rename to third_party/acados/include/acados/dense_qp/dense_qp_hpipm.h
diff --git a/phonelibs/acados/include/acados/dense_qp/dense_qp_ooqp.h b/third_party/acados/include/acados/dense_qp/dense_qp_ooqp.h
similarity index 100%
rename from phonelibs/acados/include/acados/dense_qp/dense_qp_ooqp.h
rename to third_party/acados/include/acados/dense_qp/dense_qp_ooqp.h
diff --git a/phonelibs/acados/include/acados/dense_qp/dense_qp_qore.h b/third_party/acados/include/acados/dense_qp/dense_qp_qore.h
similarity index 100%
rename from phonelibs/acados/include/acados/dense_qp/dense_qp_qore.h
rename to third_party/acados/include/acados/dense_qp/dense_qp_qore.h
diff --git a/phonelibs/acados/include/acados/dense_qp/dense_qp_qpoases.h b/third_party/acados/include/acados/dense_qp/dense_qp_qpoases.h
similarity index 100%
rename from phonelibs/acados/include/acados/dense_qp/dense_qp_qpoases.h
rename to third_party/acados/include/acados/dense_qp/dense_qp_qpoases.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_common.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_common.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_common.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgh.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgh.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgh.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgh.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgp.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgp.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgp.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_constraints_bgp.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_constraints_common.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_constraints_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_constraints_common.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_constraints_common.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_common.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_common.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_common.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_external.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_external.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_external.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_external.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_ls.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_ls.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_ls.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_ls.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_nls.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_nls.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_cost_nls.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_cost_nls.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_common.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_common.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_common.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_cont.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_cont.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_cont.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_cont.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_disc.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_disc.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_disc.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_dynamics_disc.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_common.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_common.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_common.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_convexify.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_convexify.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_convexify.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_convexify.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_mirror.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_mirror.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_mirror.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_mirror.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_noreg.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_noreg.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_noreg.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_noreg.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_project.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_project.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_project.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_project.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_project_reduc_hess.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_project_reduc_hess.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_reg_project_reduc_hess.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_reg_project_reduc_hess.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_sqp.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_sqp.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_sqp.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_sqp.h
diff --git a/phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_sqp_rti.h b/third_party/acados/include/acados/ocp_nlp/ocp_nlp_sqp_rti.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_nlp/ocp_nlp_sqp_rti.h
rename to third_party/acados/include/acados/ocp_nlp/ocp_nlp_sqp_rti.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_common.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_common.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_common.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_common_frontend.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_common_frontend.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_common_frontend.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_common_frontend.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_full_condensing.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_full_condensing.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_full_condensing.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_full_condensing.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_hpipm.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_hpipm.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_hpipm.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_hpipm.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_hpmpc.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_hpmpc.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_hpmpc.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_hpmpc.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_ooqp.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_ooqp.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_ooqp.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_ooqp.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_osqp.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_osqp.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_osqp.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_osqp.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_partial_condensing.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_partial_condensing.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_partial_condensing.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_partial_condensing.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_qpdunes.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_qpdunes.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_qpdunes.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_qpdunes.h
diff --git a/phonelibs/acados/include/acados/ocp_qp/ocp_qp_xcond_solver.h b/third_party/acados/include/acados/ocp_qp/ocp_qp_xcond_solver.h
similarity index 100%
rename from phonelibs/acados/include/acados/ocp_qp/ocp_qp_xcond_solver.h
rename to third_party/acados/include/acados/ocp_qp/ocp_qp_xcond_solver.h
diff --git a/phonelibs/acados/include/acados/sim/sim_collocation_utils.h b/third_party/acados/include/acados/sim/sim_collocation_utils.h
similarity index 100%
rename from phonelibs/acados/include/acados/sim/sim_collocation_utils.h
rename to third_party/acados/include/acados/sim/sim_collocation_utils.h
diff --git a/phonelibs/acados/include/acados/sim/sim_common.h b/third_party/acados/include/acados/sim/sim_common.h
similarity index 100%
rename from phonelibs/acados/include/acados/sim/sim_common.h
rename to third_party/acados/include/acados/sim/sim_common.h
diff --git a/phonelibs/acados/include/acados/sim/sim_erk_integrator.h b/third_party/acados/include/acados/sim/sim_erk_integrator.h
similarity index 100%
rename from phonelibs/acados/include/acados/sim/sim_erk_integrator.h
rename to third_party/acados/include/acados/sim/sim_erk_integrator.h
diff --git a/phonelibs/acados/include/acados/sim/sim_gnsf.h b/third_party/acados/include/acados/sim/sim_gnsf.h
similarity index 100%
rename from phonelibs/acados/include/acados/sim/sim_gnsf.h
rename to third_party/acados/include/acados/sim/sim_gnsf.h
diff --git a/phonelibs/acados/include/acados/sim/sim_irk_integrator.h b/third_party/acados/include/acados/sim/sim_irk_integrator.h
similarity index 100%
rename from phonelibs/acados/include/acados/sim/sim_irk_integrator.h
rename to third_party/acados/include/acados/sim/sim_irk_integrator.h
diff --git a/phonelibs/acados/include/acados/sim/sim_lifted_irk_integrator.h b/third_party/acados/include/acados/sim/sim_lifted_irk_integrator.h
similarity index 100%
rename from phonelibs/acados/include/acados/sim/sim_lifted_irk_integrator.h
rename to third_party/acados/include/acados/sim/sim_lifted_irk_integrator.h
diff --git a/phonelibs/acados/include/acados/utils/external_function_generic.h b/third_party/acados/include/acados/utils/external_function_generic.h
similarity index 100%
rename from phonelibs/acados/include/acados/utils/external_function_generic.h
rename to third_party/acados/include/acados/utils/external_function_generic.h
diff --git a/phonelibs/acados/include/acados/utils/math.h b/third_party/acados/include/acados/utils/math.h
similarity index 100%
rename from phonelibs/acados/include/acados/utils/math.h
rename to third_party/acados/include/acados/utils/math.h
diff --git a/phonelibs/acados/include/acados/utils/mem.h b/third_party/acados/include/acados/utils/mem.h
similarity index 100%
rename from phonelibs/acados/include/acados/utils/mem.h
rename to third_party/acados/include/acados/utils/mem.h
diff --git a/phonelibs/acados/include/acados/utils/print.h b/third_party/acados/include/acados/utils/print.h
similarity index 100%
rename from phonelibs/acados/include/acados/utils/print.h
rename to third_party/acados/include/acados/utils/print.h
diff --git a/phonelibs/acados/include/acados/utils/strsep.h b/third_party/acados/include/acados/utils/strsep.h
similarity index 100%
rename from phonelibs/acados/include/acados/utils/strsep.h
rename to third_party/acados/include/acados/utils/strsep.h
diff --git a/phonelibs/acados/include/acados/utils/timing.h b/third_party/acados/include/acados/utils/timing.h
similarity index 100%
rename from phonelibs/acados/include/acados/utils/timing.h
rename to third_party/acados/include/acados/utils/timing.h
diff --git a/phonelibs/acados/include/acados/utils/types.h b/third_party/acados/include/acados/utils/types.h
similarity index 100%
rename from phonelibs/acados/include/acados/utils/types.h
rename to third_party/acados/include/acados/utils/types.h
diff --git a/phonelibs/acados/include/acados_c/condensing_interface.h b/third_party/acados/include/acados_c/condensing_interface.h
similarity index 100%
rename from phonelibs/acados/include/acados_c/condensing_interface.h
rename to third_party/acados/include/acados_c/condensing_interface.h
diff --git a/phonelibs/acados/include/acados_c/dense_qp_interface.h b/third_party/acados/include/acados_c/dense_qp_interface.h
similarity index 100%
rename from phonelibs/acados/include/acados_c/dense_qp_interface.h
rename to third_party/acados/include/acados_c/dense_qp_interface.h
diff --git a/phonelibs/acados/include/acados_c/external_function_interface.h b/third_party/acados/include/acados_c/external_function_interface.h
similarity index 100%
rename from phonelibs/acados/include/acados_c/external_function_interface.h
rename to third_party/acados/include/acados_c/external_function_interface.h
diff --git a/phonelibs/acados/include/acados_c/ocp_nlp_interface.h b/third_party/acados/include/acados_c/ocp_nlp_interface.h
similarity index 100%
rename from phonelibs/acados/include/acados_c/ocp_nlp_interface.h
rename to third_party/acados/include/acados_c/ocp_nlp_interface.h
diff --git a/phonelibs/acados/include/acados_c/ocp_qp_interface.h b/third_party/acados/include/acados_c/ocp_qp_interface.h
similarity index 100%
rename from phonelibs/acados/include/acados_c/ocp_qp_interface.h
rename to third_party/acados/include/acados_c/ocp_qp_interface.h
diff --git a/phonelibs/acados/include/acados_c/sim_interface.h b/third_party/acados/include/acados_c/sim_interface.h
similarity index 100%
rename from phonelibs/acados/include/acados_c/sim_interface.h
rename to third_party/acados/include/acados_c/sim_interface.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo.h b/third_party/acados/include/blasfeo/include/blasfeo.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo.h
rename to third_party/acados/include/blasfeo/include/blasfeo.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_block_size.h b/third_party/acados/include/blasfeo/include/blasfeo_block_size.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_block_size.h
rename to third_party/acados/include/blasfeo/include/blasfeo_block_size.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_common.h b/third_party/acados/include/blasfeo/include/blasfeo_common.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_common.h
rename to third_party/acados/include/blasfeo/include/blasfeo_common.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_aux.h b/third_party/acados/include/blasfeo/include/blasfeo_d_aux.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_aux.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_aux.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep.h b/third_party/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep_ref.h b/third_party/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep_ref.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep_ref.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_aux_ext_dep_ref.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_old.h b/third_party/acados/include/blasfeo/include/blasfeo_d_aux_old.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_old.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_aux_old.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_ref.h b/third_party/acados/include/blasfeo/include/blasfeo_d_aux_ref.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_ref.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_aux_ref.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_test.h b/third_party/acados/include/blasfeo/include/blasfeo_d_aux_test.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_aux_test.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_aux_test.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_blas.h b/third_party/acados/include/blasfeo/include/blasfeo_d_blas.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_blas.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_blas.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_blas_api.h b/third_party/acados/include/blasfeo/include/blasfeo_d_blas_api.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_blas_api.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_blas_api.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_blasfeo_api.h b/third_party/acados/include/blasfeo/include/blasfeo_d_blasfeo_api.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_blasfeo_api.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_blasfeo_api.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_blasfeo_api_ref.h b/third_party/acados/include/blasfeo/include/blasfeo_d_blasfeo_api_ref.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_blasfeo_api_ref.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_blasfeo_api_ref.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_blasfeo_ref_api.h b/third_party/acados/include/blasfeo/include/blasfeo_d_blasfeo_ref_api.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_blasfeo_ref_api.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_blasfeo_ref_api.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_d_kernel.h b/third_party/acados/include/blasfeo/include/blasfeo_d_kernel.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_d_kernel.h
rename to third_party/acados/include/blasfeo/include/blasfeo_d_kernel.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_i_aux_ext_dep.h b/third_party/acados/include/blasfeo/include/blasfeo_i_aux_ext_dep.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_i_aux_ext_dep.h
rename to third_party/acados/include/blasfeo/include/blasfeo_i_aux_ext_dep.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_m_aux.h b/third_party/acados/include/blasfeo/include/blasfeo_m_aux.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_m_aux.h
rename to third_party/acados/include/blasfeo/include/blasfeo_m_aux.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_memory.h b/third_party/acados/include/blasfeo/include/blasfeo_memory.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_memory.h
rename to third_party/acados/include/blasfeo/include/blasfeo_memory.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_naming.h b/third_party/acados/include/blasfeo/include/blasfeo_naming.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_naming.h
rename to third_party/acados/include/blasfeo/include/blasfeo_naming.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_processor_features.h b/third_party/acados/include/blasfeo/include/blasfeo_processor_features.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_processor_features.h
rename to third_party/acados/include/blasfeo/include/blasfeo_processor_features.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_aux.h b/third_party/acados/include/blasfeo/include/blasfeo_s_aux.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_aux.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_aux.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep.h b/third_party/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep_ref.h b/third_party/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep_ref.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep_ref.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_aux_ext_dep_ref.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_old.h b/third_party/acados/include/blasfeo/include/blasfeo_s_aux_old.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_old.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_aux_old.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_ref.h b/third_party/acados/include/blasfeo/include/blasfeo_s_aux_ref.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_ref.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_aux_ref.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_test.h b/third_party/acados/include/blasfeo/include/blasfeo_s_aux_test.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_aux_test.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_aux_test.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_blas.h b/third_party/acados/include/blasfeo/include/blasfeo_s_blas.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_blas.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_blas.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_blas_api.h b/third_party/acados/include/blasfeo/include/blasfeo_s_blas_api.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_blas_api.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_blas_api.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_blasfeo_api.h b/third_party/acados/include/blasfeo/include/blasfeo_s_blasfeo_api.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_blasfeo_api.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_blasfeo_api.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_blasfeo_api_ref.h b/third_party/acados/include/blasfeo/include/blasfeo_s_blasfeo_api_ref.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_blasfeo_api_ref.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_blasfeo_api_ref.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_blasfeo_ref_api.h b/third_party/acados/include/blasfeo/include/blasfeo_s_blasfeo_ref_api.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_blasfeo_ref_api.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_blasfeo_ref_api.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_s_kernel.h b/third_party/acados/include/blasfeo/include/blasfeo_s_kernel.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_s_kernel.h
rename to third_party/acados/include/blasfeo/include/blasfeo_s_kernel.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_stdlib.h b/third_party/acados/include/blasfeo/include/blasfeo_stdlib.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_stdlib.h
rename to third_party/acados/include/blasfeo/include/blasfeo_stdlib.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_target.h b/third_party/acados/include/blasfeo/include/blasfeo_target.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_target.h
rename to third_party/acados/include/blasfeo/include/blasfeo_target.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_timing.h b/third_party/acados/include/blasfeo/include/blasfeo_timing.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_timing.h
rename to third_party/acados/include/blasfeo/include/blasfeo_timing.h
diff --git a/phonelibs/acados/include/blasfeo/include/blasfeo_v_aux_ext_dep.h b/third_party/acados/include/blasfeo/include/blasfeo_v_aux_ext_dep.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/blasfeo_v_aux_ext_dep.h
rename to third_party/acados/include/blasfeo/include/blasfeo_v_aux_ext_dep.h
diff --git a/phonelibs/acados/include/blasfeo/include/d_blas.h b/third_party/acados/include/blasfeo/include/d_blas.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/d_blas.h
rename to third_party/acados/include/blasfeo/include/d_blas.h
diff --git a/phonelibs/acados/include/blasfeo/include/d_blas_64.h b/third_party/acados/include/blasfeo/include/d_blas_64.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/d_blas_64.h
rename to third_party/acados/include/blasfeo/include/d_blas_64.h
diff --git a/phonelibs/acados/include/blasfeo/include/s_blas.h b/third_party/acados/include/blasfeo/include/s_blas.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/s_blas.h
rename to third_party/acados/include/blasfeo/include/s_blas.h
diff --git a/phonelibs/acados/include/blasfeo/include/s_blas_64.h b/third_party/acados/include/blasfeo/include/s_blas_64.h
similarity index 100%
rename from phonelibs/acados/include/blasfeo/include/s_blas_64.h
rename to third_party/acados/include/blasfeo/include/s_blas_64.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_aux_mem.h b/third_party/acados/include/hpipm/include/hpipm_aux_mem.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_aux_mem.h
rename to third_party/acados/include/hpipm/include/hpipm_aux_mem.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_aux_string.h b/third_party/acados/include/hpipm/include/hpipm_aux_string.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_aux_string.h
rename to third_party/acados/include/hpipm/include/hpipm_aux_string.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_common.h b/third_party/acados/include/hpipm/include/hpipm_common.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_common.h
rename to third_party/acados/include/hpipm/include/hpipm_common.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_cast_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_d_cast_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_cast_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_cast_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_cond.h b/third_party/acados/include/hpipm/include/hpipm_d_cond.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_cond.h
rename to third_party/acados/include/hpipm/include/hpipm_d_cond.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_cond_aux.h b/third_party/acados/include/hpipm/include/hpipm_d_cond_aux.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_cond_aux.h
rename to third_party/acados/include/hpipm/include/hpipm_d_cond_aux.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_cond_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_d_cond_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_cond_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_cond_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_core_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_d_core_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_core_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_d_core_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_core_qp_ipm_aux.h b/third_party/acados/include/hpipm/include/hpipm_d_core_qp_ipm_aux.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_core_qp_ipm_aux.h
rename to third_party/acados/include/hpipm/include/hpipm_d_core_qp_ipm_aux.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_dim.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_res.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_sol.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_utils.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qcqp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qcqp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_dim.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_kkt.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qp_kkt.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_kkt.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qp_kkt.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_res.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_sol.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_utils.h b/third_party/acados/include/hpipm/include/hpipm_d_dense_qp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_dense_qp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_d_dense_qp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_dim.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_res.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_sol.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_utils.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qcqp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qcqp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_dim.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_kkt.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_kkt.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_kkt.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_kkt.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_red.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_red.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_red.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_red.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_res.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_sol.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_utils.h b/third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_ocp_qp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_d_ocp_qp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_part_cond.h b/third_party/acados/include/hpipm/include/hpipm_d_part_cond.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_part_cond.h
rename to third_party/acados/include/hpipm/include/hpipm_d_part_cond.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_part_cond_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_d_part_cond_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_part_cond_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_part_cond_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_sim_erk.h b/third_party/acados/include/hpipm/include/hpipm_d_sim_erk.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_sim_erk.h
rename to third_party/acados/include/hpipm/include/hpipm_d_sim_erk.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_sim_rk.h b/third_party/acados/include/hpipm/include/hpipm_d_sim_rk.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_sim_rk.h
rename to third_party/acados/include/hpipm/include/hpipm_d_sim_rk.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_dim.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_res.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_sol.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_utils.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qcqp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_dim.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_kkt.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_kkt.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_kkt.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_kkt.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_res.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_sol.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_utils.h b/third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_d_tree_ocp_qp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_m_dense_qp.h b/third_party/acados/include/hpipm/include/hpipm_m_dense_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_m_dense_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_m_dense_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_m_dense_qp_dim.h b/third_party/acados/include/hpipm/include/hpipm_m_dense_qp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_m_dense_qp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_m_dense_qp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_m_ocp_qp.h b/third_party/acados/include/hpipm/include/hpipm_m_ocp_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_m_ocp_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_m_ocp_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_m_ocp_qp_ipm_hard.h b/third_party/acados/include/hpipm/include/hpipm_m_ocp_qp_ipm_hard.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_m_ocp_qp_ipm_hard.h
rename to third_party/acados/include/hpipm/include/hpipm_m_ocp_qp_ipm_hard.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_m_ocp_qp_kkt.h b/third_party/acados/include/hpipm/include/hpipm_m_ocp_qp_kkt.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_m_ocp_qp_kkt.h
rename to third_party/acados/include/hpipm/include/hpipm_m_ocp_qp_kkt.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_cast_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_s_cast_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_cast_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_cast_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_cond.h b/third_party/acados/include/hpipm/include/hpipm_s_cond.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_cond.h
rename to third_party/acados/include/hpipm/include/hpipm_s_cond.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_cond_aux.h b/third_party/acados/include/hpipm/include/hpipm_s_cond_aux.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_cond_aux.h
rename to third_party/acados/include/hpipm/include/hpipm_s_cond_aux.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_cond_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_s_cond_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_cond_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_cond_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_core_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_s_core_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_core_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_s_core_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_core_qp_ipm_aux.h b/third_party/acados/include/hpipm/include/hpipm_s_core_qp_ipm_aux.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_core_qp_ipm_aux.h
rename to third_party/acados/include/hpipm/include/hpipm_s_core_qp_ipm_aux.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_dim.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_res.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_sol.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_utils.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qcqp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qcqp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_dim.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_kkt.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qp_kkt.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_kkt.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qp_kkt.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_res.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_sol.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_utils.h b/third_party/acados/include/hpipm/include/hpipm_s_dense_qp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_dense_qp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_s_dense_qp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_dim.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_res.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_sol.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_utils.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qcqp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qcqp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_dim.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_kkt.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_kkt.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_kkt.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_kkt.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_red.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_red.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_red.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_red.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_res.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_sol.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_utils.h b/third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_ocp_qp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_s_ocp_qp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_part_cond.h b/third_party/acados/include/hpipm/include/hpipm_s_part_cond.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_part_cond.h
rename to third_party/acados/include/hpipm/include/hpipm_s_part_cond.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_part_cond_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_s_part_cond_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_part_cond_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_part_cond_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_sim_erk.h b/third_party/acados/include/hpipm/include/hpipm_s_sim_erk.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_sim_erk.h
rename to third_party/acados/include/hpipm/include/hpipm_s_sim_erk.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_sim_rk.h b/third_party/acados/include/hpipm/include/hpipm_s_sim_rk.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_sim_rk.h
rename to third_party/acados/include/hpipm/include/hpipm_s_sim_rk.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_dim.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_res.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_sol.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_utils.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qcqp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_dim.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_dim.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_dim.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_dim.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_ipm.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_ipm.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_ipm.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_ipm.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_kkt.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_kkt.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_kkt.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_kkt.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_res.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_res.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_res.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_res.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_sol.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_sol.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_sol.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_sol.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_utils.h b/third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_utils.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_utils.h
rename to third_party/acados/include/hpipm/include/hpipm_s_tree_ocp_qp_utils.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_scenario_tree.h b/third_party/acados/include/hpipm/include/hpipm_scenario_tree.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_scenario_tree.h
rename to third_party/acados/include/hpipm/include/hpipm_scenario_tree.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_timing.h b/third_party/acados/include/hpipm/include/hpipm_timing.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_timing.h
rename to third_party/acados/include/hpipm/include/hpipm_timing.h
diff --git a/phonelibs/acados/include/hpipm/include/hpipm_tree.h b/third_party/acados/include/hpipm/include/hpipm_tree.h
similarity index 100%
rename from phonelibs/acados/include/hpipm/include/hpipm_tree.h
rename to third_party/acados/include/hpipm/include/hpipm_tree.h
diff --git a/phonelibs/acados/include/qpOASES_e/Bounds.h b/third_party/acados/include/qpOASES_e/Bounds.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Bounds.h
rename to third_party/acados/include/qpOASES_e/Bounds.h
diff --git a/phonelibs/acados/include/qpOASES_e/Constants.h b/third_party/acados/include/qpOASES_e/Constants.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Constants.h
rename to third_party/acados/include/qpOASES_e/Constants.h
diff --git a/phonelibs/acados/include/qpOASES_e/ConstraintProduct.h b/third_party/acados/include/qpOASES_e/ConstraintProduct.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/ConstraintProduct.h
rename to third_party/acados/include/qpOASES_e/ConstraintProduct.h
diff --git a/phonelibs/acados/include/qpOASES_e/Constraints.h b/third_party/acados/include/qpOASES_e/Constraints.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Constraints.h
rename to third_party/acados/include/qpOASES_e/Constraints.h
diff --git a/phonelibs/acados/include/qpOASES_e/Flipper.h b/third_party/acados/include/qpOASES_e/Flipper.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Flipper.h
rename to third_party/acados/include/qpOASES_e/Flipper.h
diff --git a/phonelibs/acados/include/qpOASES_e/Indexlist.h b/third_party/acados/include/qpOASES_e/Indexlist.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Indexlist.h
rename to third_party/acados/include/qpOASES_e/Indexlist.h
diff --git a/phonelibs/acados/include/qpOASES_e/Matrices.h b/third_party/acados/include/qpOASES_e/Matrices.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Matrices.h
rename to third_party/acados/include/qpOASES_e/Matrices.h
diff --git a/phonelibs/acados/include/qpOASES_e/MessageHandling.h b/third_party/acados/include/qpOASES_e/MessageHandling.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/MessageHandling.h
rename to third_party/acados/include/qpOASES_e/MessageHandling.h
diff --git a/phonelibs/acados/include/qpOASES_e/Options.h b/third_party/acados/include/qpOASES_e/Options.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Options.h
rename to third_party/acados/include/qpOASES_e/Options.h
diff --git a/phonelibs/acados/include/qpOASES_e/QProblem.h b/third_party/acados/include/qpOASES_e/QProblem.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/QProblem.h
rename to third_party/acados/include/qpOASES_e/QProblem.h
diff --git a/phonelibs/acados/include/qpOASES_e/QProblemB.h b/third_party/acados/include/qpOASES_e/QProblemB.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/QProblemB.h
rename to third_party/acados/include/qpOASES_e/QProblemB.h
diff --git a/phonelibs/acados/include/qpOASES_e/Types.h b/third_party/acados/include/qpOASES_e/Types.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Types.h
rename to third_party/acados/include/qpOASES_e/Types.h
diff --git a/phonelibs/acados/include/qpOASES_e/UnitTesting.h b/third_party/acados/include/qpOASES_e/UnitTesting.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/UnitTesting.h
rename to third_party/acados/include/qpOASES_e/UnitTesting.h
diff --git a/phonelibs/acados/include/qpOASES_e/Utils.h b/third_party/acados/include/qpOASES_e/Utils.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/Utils.h
rename to third_party/acados/include/qpOASES_e/Utils.h
diff --git a/phonelibs/acados/include/qpOASES_e/extras/OQPinterface.h b/third_party/acados/include/qpOASES_e/extras/OQPinterface.h
similarity index 100%
rename from phonelibs/acados/include/qpOASES_e/extras/OQPinterface.h
rename to third_party/acados/include/qpOASES_e/extras/OQPinterface.h
diff --git a/phonelibs/acados/larch64/lib/libacados.so b/third_party/acados/larch64/lib/libacados.so
similarity index 100%
rename from phonelibs/acados/larch64/lib/libacados.so
rename to third_party/acados/larch64/lib/libacados.so
diff --git a/phonelibs/acados/larch64/lib/libblasfeo.so b/third_party/acados/larch64/lib/libblasfeo.so
similarity index 100%
rename from phonelibs/acados/larch64/lib/libblasfeo.so
rename to third_party/acados/larch64/lib/libblasfeo.so
diff --git a/phonelibs/acados/larch64/lib/libhpipm.so b/third_party/acados/larch64/lib/libhpipm.so
similarity index 100%
rename from phonelibs/acados/larch64/lib/libhpipm.so
rename to third_party/acados/larch64/lib/libhpipm.so
diff --git a/phonelibs/acados/larch64/lib/libqpOASES_e.so b/third_party/acados/larch64/lib/libqpOASES_e.so
similarity index 100%
rename from phonelibs/acados/larch64/lib/libqpOASES_e.so
rename to third_party/acados/larch64/lib/libqpOASES_e.so
diff --git a/phonelibs/acados/larch64/lib/libqpOASES_e.so.3.1 b/third_party/acados/larch64/lib/libqpOASES_e.so.3.1
similarity index 100%
rename from phonelibs/acados/larch64/lib/libqpOASES_e.so.3.1
rename to third_party/acados/larch64/lib/libqpOASES_e.so.3.1
diff --git a/phonelibs/acados/larch64/t_renderer b/third_party/acados/larch64/t_renderer
similarity index 100%
rename from phonelibs/acados/larch64/t_renderer
rename to third_party/acados/larch64/t_renderer
diff --git a/phonelibs/acados/x86_64/lib/libacados.so b/third_party/acados/x86_64/lib/libacados.so
similarity index 100%
rename from phonelibs/acados/x86_64/lib/libacados.so
rename to third_party/acados/x86_64/lib/libacados.so
diff --git a/phonelibs/acados/x86_64/lib/libblasfeo.so b/third_party/acados/x86_64/lib/libblasfeo.so
similarity index 100%
rename from phonelibs/acados/x86_64/lib/libblasfeo.so
rename to third_party/acados/x86_64/lib/libblasfeo.so
diff --git a/phonelibs/acados/x86_64/lib/libhpipm.so b/third_party/acados/x86_64/lib/libhpipm.so
similarity index 100%
rename from phonelibs/acados/x86_64/lib/libhpipm.so
rename to third_party/acados/x86_64/lib/libhpipm.so
diff --git a/phonelibs/acados/x86_64/lib/libqpOASES_e.so b/third_party/acados/x86_64/lib/libqpOASES_e.so
similarity index 100%
rename from phonelibs/acados/x86_64/lib/libqpOASES_e.so
rename to third_party/acados/x86_64/lib/libqpOASES_e.so
diff --git a/phonelibs/acados/x86_64/lib/libqpOASES_e.so.3.1 b/third_party/acados/x86_64/lib/libqpOASES_e.so.3.1
similarity index 100%
rename from phonelibs/acados/x86_64/lib/libqpOASES_e.so.3.1
rename to third_party/acados/x86_64/lib/libqpOASES_e.so.3.1
diff --git a/phonelibs/acados/x86_64/t_renderer b/third_party/acados/x86_64/t_renderer
similarity index 100%
rename from phonelibs/acados/x86_64/t_renderer
rename to third_party/acados/x86_64/t_renderer
diff --git a/phonelibs/android_frameworks_native/get.txt b/third_party/android_frameworks_native/get.txt
similarity index 73%
rename from phonelibs/android_frameworks_native/get.txt
rename to third_party/android_frameworks_native/get.txt
index 31f42ebe0..277bdcb6a 100644
--- a/phonelibs/android_frameworks_native/get.txt
+++ b/third_party/android_frameworks_native/get.txt
@@ -1,3 +1,3 @@
 git clone https://github.com/CyanogenMod/android_frameworks_native.git && cd android_frameworks_native
 git reset --hard b22bca465e55618a949d9cbdea665a1a3a831241
-cp -r include ~/one/phonelibs/android_frameworks_native/
+cp -r include ~/one/third_party/android_frameworks_native/
diff --git a/phonelibs/android_frameworks_native/include/android/asset_manager.h b/third_party/android_frameworks_native/include/android/asset_manager.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/asset_manager.h
rename to third_party/android_frameworks_native/include/android/asset_manager.h
diff --git a/phonelibs/android_frameworks_native/include/android/asset_manager_jni.h b/third_party/android_frameworks_native/include/android/asset_manager_jni.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/asset_manager_jni.h
rename to third_party/android_frameworks_native/include/android/asset_manager_jni.h
diff --git a/phonelibs/android_frameworks_native/include/android/bitmap.h b/third_party/android_frameworks_native/include/android/bitmap.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/bitmap.h
rename to third_party/android_frameworks_native/include/android/bitmap.h
diff --git a/phonelibs/android_frameworks_native/include/android/configuration.h b/third_party/android_frameworks_native/include/android/configuration.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/configuration.h
rename to third_party/android_frameworks_native/include/android/configuration.h
diff --git a/phonelibs/android_frameworks_native/include/android/input.h b/third_party/android_frameworks_native/include/android/input.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/input.h
rename to third_party/android_frameworks_native/include/android/input.h
diff --git a/phonelibs/android_frameworks_native/include/android/keycodes.h b/third_party/android_frameworks_native/include/android/keycodes.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/keycodes.h
rename to third_party/android_frameworks_native/include/android/keycodes.h
diff --git a/phonelibs/android_frameworks_native/include/android/looper.h b/third_party/android_frameworks_native/include/android/looper.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/looper.h
rename to third_party/android_frameworks_native/include/android/looper.h
diff --git a/phonelibs/android_frameworks_native/include/android/multinetwork.h b/third_party/android_frameworks_native/include/android/multinetwork.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/multinetwork.h
rename to third_party/android_frameworks_native/include/android/multinetwork.h
diff --git a/phonelibs/android_frameworks_native/include/android/native_activity.h b/third_party/android_frameworks_native/include/android/native_activity.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/native_activity.h
rename to third_party/android_frameworks_native/include/android/native_activity.h
diff --git a/phonelibs/android_frameworks_native/include/android/native_window.h b/third_party/android_frameworks_native/include/android/native_window.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/native_window.h
rename to third_party/android_frameworks_native/include/android/native_window.h
diff --git a/phonelibs/android_frameworks_native/include/android/native_window_jni.h b/third_party/android_frameworks_native/include/android/native_window_jni.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/native_window_jni.h
rename to third_party/android_frameworks_native/include/android/native_window_jni.h
diff --git a/phonelibs/android_frameworks_native/include/android/obb.h b/third_party/android_frameworks_native/include/android/obb.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/obb.h
rename to third_party/android_frameworks_native/include/android/obb.h
diff --git a/phonelibs/android_frameworks_native/include/android/rect.h b/third_party/android_frameworks_native/include/android/rect.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/rect.h
rename to third_party/android_frameworks_native/include/android/rect.h
diff --git a/phonelibs/android_frameworks_native/include/android/sensor.h b/third_party/android_frameworks_native/include/android/sensor.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/sensor.h
rename to third_party/android_frameworks_native/include/android/sensor.h
diff --git a/phonelibs/android_frameworks_native/include/android/storage_manager.h b/third_party/android_frameworks_native/include/android/storage_manager.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/storage_manager.h
rename to third_party/android_frameworks_native/include/android/storage_manager.h
diff --git a/phonelibs/android_frameworks_native/include/android/trace.h b/third_party/android_frameworks_native/include/android/trace.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/trace.h
rename to third_party/android_frameworks_native/include/android/trace.h
diff --git a/phonelibs/android_frameworks_native/include/android/window.h b/third_party/android_frameworks_native/include/android/window.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/android/window.h
rename to third_party/android_frameworks_native/include/android/window.h
diff --git a/phonelibs/android_frameworks_native/include/binder/AppOpsManager.h b/third_party/android_frameworks_native/include/binder/AppOpsManager.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/AppOpsManager.h
rename to third_party/android_frameworks_native/include/binder/AppOpsManager.h
diff --git a/phonelibs/android_frameworks_native/include/binder/Binder.h b/third_party/android_frameworks_native/include/binder/Binder.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/Binder.h
rename to third_party/android_frameworks_native/include/binder/Binder.h
diff --git a/phonelibs/android_frameworks_native/include/binder/BinderService.h b/third_party/android_frameworks_native/include/binder/BinderService.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/BinderService.h
rename to third_party/android_frameworks_native/include/binder/BinderService.h
diff --git a/phonelibs/android_frameworks_native/include/binder/BpBinder.h b/third_party/android_frameworks_native/include/binder/BpBinder.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/BpBinder.h
rename to third_party/android_frameworks_native/include/binder/BpBinder.h
diff --git a/phonelibs/android_frameworks_native/include/binder/BufferedTextOutput.h b/third_party/android_frameworks_native/include/binder/BufferedTextOutput.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/BufferedTextOutput.h
rename to third_party/android_frameworks_native/include/binder/BufferedTextOutput.h
diff --git a/phonelibs/android_frameworks_native/include/binder/Debug.h b/third_party/android_frameworks_native/include/binder/Debug.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/Debug.h
rename to third_party/android_frameworks_native/include/binder/Debug.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IAppOpsCallback.h b/third_party/android_frameworks_native/include/binder/IAppOpsCallback.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IAppOpsCallback.h
rename to third_party/android_frameworks_native/include/binder/IAppOpsCallback.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IAppOpsService.h b/third_party/android_frameworks_native/include/binder/IAppOpsService.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IAppOpsService.h
rename to third_party/android_frameworks_native/include/binder/IAppOpsService.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IBatteryStats.h b/third_party/android_frameworks_native/include/binder/IBatteryStats.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IBatteryStats.h
rename to third_party/android_frameworks_native/include/binder/IBatteryStats.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IBinder.h b/third_party/android_frameworks_native/include/binder/IBinder.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IBinder.h
rename to third_party/android_frameworks_native/include/binder/IBinder.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IInterface.h b/third_party/android_frameworks_native/include/binder/IInterface.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IInterface.h
rename to third_party/android_frameworks_native/include/binder/IInterface.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IMemory.h b/third_party/android_frameworks_native/include/binder/IMemory.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IMemory.h
rename to third_party/android_frameworks_native/include/binder/IMemory.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IPCThreadState.h b/third_party/android_frameworks_native/include/binder/IPCThreadState.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IPCThreadState.h
rename to third_party/android_frameworks_native/include/binder/IPCThreadState.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IPermissionController.h b/third_party/android_frameworks_native/include/binder/IPermissionController.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IPermissionController.h
rename to third_party/android_frameworks_native/include/binder/IPermissionController.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IProcessInfoService.h b/third_party/android_frameworks_native/include/binder/IProcessInfoService.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IProcessInfoService.h
rename to third_party/android_frameworks_native/include/binder/IProcessInfoService.h
diff --git a/phonelibs/android_frameworks_native/include/binder/IServiceManager.h b/third_party/android_frameworks_native/include/binder/IServiceManager.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/IServiceManager.h
rename to third_party/android_frameworks_native/include/binder/IServiceManager.h
diff --git a/phonelibs/android_frameworks_native/include/binder/MemoryBase.h b/third_party/android_frameworks_native/include/binder/MemoryBase.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/MemoryBase.h
rename to third_party/android_frameworks_native/include/binder/MemoryBase.h
diff --git a/phonelibs/android_frameworks_native/include/binder/MemoryDealer.h b/third_party/android_frameworks_native/include/binder/MemoryDealer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/MemoryDealer.h
rename to third_party/android_frameworks_native/include/binder/MemoryDealer.h
diff --git a/phonelibs/android_frameworks_native/include/binder/MemoryHeapBase.h b/third_party/android_frameworks_native/include/binder/MemoryHeapBase.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/MemoryHeapBase.h
rename to third_party/android_frameworks_native/include/binder/MemoryHeapBase.h
diff --git a/phonelibs/android_frameworks_native/include/binder/MemoryHeapIon.h b/third_party/android_frameworks_native/include/binder/MemoryHeapIon.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/MemoryHeapIon.h
rename to third_party/android_frameworks_native/include/binder/MemoryHeapIon.h
diff --git a/phonelibs/android_frameworks_native/include/binder/Parcel.h b/third_party/android_frameworks_native/include/binder/Parcel.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/Parcel.h
rename to third_party/android_frameworks_native/include/binder/Parcel.h
diff --git a/phonelibs/android_frameworks_native/include/binder/PermissionCache.h b/third_party/android_frameworks_native/include/binder/PermissionCache.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/PermissionCache.h
rename to third_party/android_frameworks_native/include/binder/PermissionCache.h
diff --git a/phonelibs/android_frameworks_native/include/binder/ProcessInfoService.h b/third_party/android_frameworks_native/include/binder/ProcessInfoService.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/ProcessInfoService.h
rename to third_party/android_frameworks_native/include/binder/ProcessInfoService.h
diff --git a/phonelibs/android_frameworks_native/include/binder/ProcessState.h b/third_party/android_frameworks_native/include/binder/ProcessState.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/ProcessState.h
rename to third_party/android_frameworks_native/include/binder/ProcessState.h
diff --git a/phonelibs/android_frameworks_native/include/binder/TextOutput.h b/third_party/android_frameworks_native/include/binder/TextOutput.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/binder/TextOutput.h
rename to third_party/android_frameworks_native/include/binder/TextOutput.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BitTube.h b/third_party/android_frameworks_native/include/gui/BitTube.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BitTube.h
rename to third_party/android_frameworks_native/include/gui/BitTube.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferItem.h b/third_party/android_frameworks_native/include/gui/BufferItem.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferItem.h
rename to third_party/android_frameworks_native/include/gui/BufferItem.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferItemConsumer.h b/third_party/android_frameworks_native/include/gui/BufferItemConsumer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferItemConsumer.h
rename to third_party/android_frameworks_native/include/gui/BufferItemConsumer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferQueue.h b/third_party/android_frameworks_native/include/gui/BufferQueue.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferQueue.h
rename to third_party/android_frameworks_native/include/gui/BufferQueue.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferQueueConsumer.h b/third_party/android_frameworks_native/include/gui/BufferQueueConsumer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferQueueConsumer.h
rename to third_party/android_frameworks_native/include/gui/BufferQueueConsumer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferQueueCore.h b/third_party/android_frameworks_native/include/gui/BufferQueueCore.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferQueueCore.h
rename to third_party/android_frameworks_native/include/gui/BufferQueueCore.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferQueueDefs.h b/third_party/android_frameworks_native/include/gui/BufferQueueDefs.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferQueueDefs.h
rename to third_party/android_frameworks_native/include/gui/BufferQueueDefs.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferQueueProducer.h b/third_party/android_frameworks_native/include/gui/BufferQueueProducer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferQueueProducer.h
rename to third_party/android_frameworks_native/include/gui/BufferQueueProducer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/BufferSlot.h b/third_party/android_frameworks_native/include/gui/BufferSlot.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/BufferSlot.h
rename to third_party/android_frameworks_native/include/gui/BufferSlot.h
diff --git a/phonelibs/android_frameworks_native/include/gui/ConsumerBase.h b/third_party/android_frameworks_native/include/gui/ConsumerBase.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/ConsumerBase.h
rename to third_party/android_frameworks_native/include/gui/ConsumerBase.h
diff --git a/phonelibs/android_frameworks_native/include/gui/CpuConsumer.h b/third_party/android_frameworks_native/include/gui/CpuConsumer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/CpuConsumer.h
rename to third_party/android_frameworks_native/include/gui/CpuConsumer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/DisplayEventReceiver.h b/third_party/android_frameworks_native/include/gui/DisplayEventReceiver.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/DisplayEventReceiver.h
rename to third_party/android_frameworks_native/include/gui/DisplayEventReceiver.h
diff --git a/phonelibs/android_frameworks_native/include/gui/GLConsumer.h b/third_party/android_frameworks_native/include/gui/GLConsumer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/GLConsumer.h
rename to third_party/android_frameworks_native/include/gui/GLConsumer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/GraphicBufferAlloc.h b/third_party/android_frameworks_native/include/gui/GraphicBufferAlloc.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/GraphicBufferAlloc.h
rename to third_party/android_frameworks_native/include/gui/GraphicBufferAlloc.h
diff --git a/phonelibs/android_frameworks_native/include/gui/GuiConfig.h b/third_party/android_frameworks_native/include/gui/GuiConfig.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/GuiConfig.h
rename to third_party/android_frameworks_native/include/gui/GuiConfig.h
diff --git a/phonelibs/android_frameworks_native/include/gui/IConsumerListener.h b/third_party/android_frameworks_native/include/gui/IConsumerListener.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/IConsumerListener.h
rename to third_party/android_frameworks_native/include/gui/IConsumerListener.h
diff --git a/phonelibs/android_frameworks_native/include/gui/IDisplayEventConnection.h b/third_party/android_frameworks_native/include/gui/IDisplayEventConnection.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/IDisplayEventConnection.h
rename to third_party/android_frameworks_native/include/gui/IDisplayEventConnection.h
diff --git a/phonelibs/android_frameworks_native/include/gui/IGraphicBufferAlloc.h b/third_party/android_frameworks_native/include/gui/IGraphicBufferAlloc.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/IGraphicBufferAlloc.h
rename to third_party/android_frameworks_native/include/gui/IGraphicBufferAlloc.h
diff --git a/phonelibs/android_frameworks_native/include/gui/IGraphicBufferConsumer.h b/third_party/android_frameworks_native/include/gui/IGraphicBufferConsumer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/IGraphicBufferConsumer.h
rename to third_party/android_frameworks_native/include/gui/IGraphicBufferConsumer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/IGraphicBufferProducer.h b/third_party/android_frameworks_native/include/gui/IGraphicBufferProducer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/IGraphicBufferProducer.h
rename to third_party/android_frameworks_native/include/gui/IGraphicBufferProducer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/IProducerListener.h b/third_party/android_frameworks_native/include/gui/IProducerListener.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/IProducerListener.h
rename to third_party/android_frameworks_native/include/gui/IProducerListener.h
diff --git a/phonelibs/android_frameworks_native/include/gui/ISensorEventConnection.h b/third_party/android_frameworks_native/include/gui/ISensorEventConnection.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/ISensorEventConnection.h
rename to third_party/android_frameworks_native/include/gui/ISensorEventConnection.h
diff --git a/phonelibs/android_frameworks_native/include/gui/ISensorServer.h b/third_party/android_frameworks_native/include/gui/ISensorServer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/ISensorServer.h
rename to third_party/android_frameworks_native/include/gui/ISensorServer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/ISurfaceComposer.h b/third_party/android_frameworks_native/include/gui/ISurfaceComposer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/ISurfaceComposer.h
rename to third_party/android_frameworks_native/include/gui/ISurfaceComposer.h
diff --git a/phonelibs/android_frameworks_native/include/gui/ISurfaceComposerClient.h b/third_party/android_frameworks_native/include/gui/ISurfaceComposerClient.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/ISurfaceComposerClient.h
rename to third_party/android_frameworks_native/include/gui/ISurfaceComposerClient.h
diff --git a/phonelibs/android_frameworks_native/include/gui/Sensor.h b/third_party/android_frameworks_native/include/gui/Sensor.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/Sensor.h
rename to third_party/android_frameworks_native/include/gui/Sensor.h
diff --git a/phonelibs/android_frameworks_native/include/gui/SensorEventQueue.h b/third_party/android_frameworks_native/include/gui/SensorEventQueue.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/SensorEventQueue.h
rename to third_party/android_frameworks_native/include/gui/SensorEventQueue.h
diff --git a/phonelibs/android_frameworks_native/include/gui/SensorManager.h b/third_party/android_frameworks_native/include/gui/SensorManager.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/SensorManager.h
rename to third_party/android_frameworks_native/include/gui/SensorManager.h
diff --git a/phonelibs/android_frameworks_native/include/gui/StreamSplitter.h b/third_party/android_frameworks_native/include/gui/StreamSplitter.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/StreamSplitter.h
rename to third_party/android_frameworks_native/include/gui/StreamSplitter.h
diff --git a/phonelibs/android_frameworks_native/include/gui/Surface.h b/third_party/android_frameworks_native/include/gui/Surface.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/Surface.h
rename to third_party/android_frameworks_native/include/gui/Surface.h
diff --git a/phonelibs/android_frameworks_native/include/gui/SurfaceComposerClient.h b/third_party/android_frameworks_native/include/gui/SurfaceComposerClient.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/SurfaceComposerClient.h
rename to third_party/android_frameworks_native/include/gui/SurfaceComposerClient.h
diff --git a/phonelibs/android_frameworks_native/include/gui/SurfaceControl.h b/third_party/android_frameworks_native/include/gui/SurfaceControl.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/gui/SurfaceControl.h
rename to third_party/android_frameworks_native/include/gui/SurfaceControl.h
diff --git a/phonelibs/android_frameworks_native/include/ui/ANativeObjectBase.h b/third_party/android_frameworks_native/include/ui/ANativeObjectBase.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/ANativeObjectBase.h
rename to third_party/android_frameworks_native/include/ui/ANativeObjectBase.h
diff --git a/phonelibs/android_frameworks_native/include/ui/DisplayInfo.h b/third_party/android_frameworks_native/include/ui/DisplayInfo.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/DisplayInfo.h
rename to third_party/android_frameworks_native/include/ui/DisplayInfo.h
diff --git a/phonelibs/android_frameworks_native/include/ui/DisplayStatInfo.h b/third_party/android_frameworks_native/include/ui/DisplayStatInfo.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/DisplayStatInfo.h
rename to third_party/android_frameworks_native/include/ui/DisplayStatInfo.h
diff --git a/phonelibs/android_frameworks_native/include/ui/Fence.h b/third_party/android_frameworks_native/include/ui/Fence.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/Fence.h
rename to third_party/android_frameworks_native/include/ui/Fence.h
diff --git a/phonelibs/android_frameworks_native/include/ui/FrameStats.h b/third_party/android_frameworks_native/include/ui/FrameStats.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/FrameStats.h
rename to third_party/android_frameworks_native/include/ui/FrameStats.h
diff --git a/phonelibs/android_frameworks_native/include/ui/FramebufferNativeWindow.h b/third_party/android_frameworks_native/include/ui/FramebufferNativeWindow.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/FramebufferNativeWindow.h
rename to third_party/android_frameworks_native/include/ui/FramebufferNativeWindow.h
diff --git a/phonelibs/android_frameworks_native/include/ui/GraphicBuffer.h b/third_party/android_frameworks_native/include/ui/GraphicBuffer.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/GraphicBuffer.h
rename to third_party/android_frameworks_native/include/ui/GraphicBuffer.h
diff --git a/phonelibs/android_frameworks_native/include/ui/GraphicBufferAllocator.h b/third_party/android_frameworks_native/include/ui/GraphicBufferAllocator.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/GraphicBufferAllocator.h
rename to third_party/android_frameworks_native/include/ui/GraphicBufferAllocator.h
diff --git a/phonelibs/android_frameworks_native/include/ui/GraphicBufferMapper.h b/third_party/android_frameworks_native/include/ui/GraphicBufferMapper.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/GraphicBufferMapper.h
rename to third_party/android_frameworks_native/include/ui/GraphicBufferMapper.h
diff --git a/phonelibs/android_frameworks_native/include/ui/PixelFormat.h b/third_party/android_frameworks_native/include/ui/PixelFormat.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/PixelFormat.h
rename to third_party/android_frameworks_native/include/ui/PixelFormat.h
diff --git a/phonelibs/android_frameworks_native/include/ui/Point.h b/third_party/android_frameworks_native/include/ui/Point.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/Point.h
rename to third_party/android_frameworks_native/include/ui/Point.h
diff --git a/phonelibs/android_frameworks_native/include/ui/Rect.h b/third_party/android_frameworks_native/include/ui/Rect.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/Rect.h
rename to third_party/android_frameworks_native/include/ui/Rect.h
diff --git a/phonelibs/android_frameworks_native/include/ui/Region.h b/third_party/android_frameworks_native/include/ui/Region.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/Region.h
rename to third_party/android_frameworks_native/include/ui/Region.h
diff --git a/phonelibs/android_frameworks_native/include/ui/TMatHelpers.h b/third_party/android_frameworks_native/include/ui/TMatHelpers.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/TMatHelpers.h
rename to third_party/android_frameworks_native/include/ui/TMatHelpers.h
diff --git a/phonelibs/android_frameworks_native/include/ui/TVecHelpers.h b/third_party/android_frameworks_native/include/ui/TVecHelpers.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/TVecHelpers.h
rename to third_party/android_frameworks_native/include/ui/TVecHelpers.h
diff --git a/phonelibs/android_frameworks_native/include/ui/UiConfig.h b/third_party/android_frameworks_native/include/ui/UiConfig.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/UiConfig.h
rename to third_party/android_frameworks_native/include/ui/UiConfig.h
diff --git a/phonelibs/android_frameworks_native/include/ui/mat4.h b/third_party/android_frameworks_native/include/ui/mat4.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/mat4.h
rename to third_party/android_frameworks_native/include/ui/mat4.h
diff --git a/phonelibs/android_frameworks_native/include/ui/vec2.h b/third_party/android_frameworks_native/include/ui/vec2.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/vec2.h
rename to third_party/android_frameworks_native/include/ui/vec2.h
diff --git a/phonelibs/android_frameworks_native/include/ui/vec3.h b/third_party/android_frameworks_native/include/ui/vec3.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/vec3.h
rename to third_party/android_frameworks_native/include/ui/vec3.h
diff --git a/phonelibs/android_frameworks_native/include/ui/vec4.h b/third_party/android_frameworks_native/include/ui/vec4.h
similarity index 100%
rename from phonelibs/android_frameworks_native/include/ui/vec4.h
rename to third_party/android_frameworks_native/include/ui/vec4.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/activity_recognition.h b/third_party/android_hardware_libhardware/include/hardware/activity_recognition.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/activity_recognition.h
rename to third_party/android_hardware_libhardware/include/hardware/activity_recognition.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/audio.h b/third_party/android_hardware_libhardware/include/hardware/audio.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/audio.h
rename to third_party/android_hardware_libhardware/include/hardware/audio.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/audio_alsaops.h b/third_party/android_hardware_libhardware/include/hardware/audio_alsaops.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/audio_alsaops.h
rename to third_party/android_hardware_libhardware/include/hardware/audio_alsaops.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/audio_amplifier.h b/third_party/android_hardware_libhardware/include/hardware/audio_amplifier.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/audio_amplifier.h
rename to third_party/android_hardware_libhardware/include/hardware/audio_amplifier.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/audio_effect.h b/third_party/android_hardware_libhardware/include/hardware/audio_effect.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/audio_effect.h
rename to third_party/android_hardware_libhardware/include/hardware/audio_effect.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/audio_policy.h b/third_party/android_hardware_libhardware/include/hardware/audio_policy.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/audio_policy.h
rename to third_party/android_hardware_libhardware/include/hardware/audio_policy.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bluetooth.h b/third_party/android_hardware_libhardware/include/hardware/bluetooth.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bluetooth.h
rename to third_party/android_hardware_libhardware/include/hardware/bluetooth.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_av.h b/third_party/android_hardware_libhardware/include/hardware/bt_av.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_av.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_av.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_common_types.h b/third_party/android_hardware_libhardware/include/hardware/bt_common_types.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_common_types.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_common_types.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_gatt.h b/third_party/android_hardware_libhardware/include/hardware/bt_gatt.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_gatt.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_gatt.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_gatt_client.h b/third_party/android_hardware_libhardware/include/hardware/bt_gatt_client.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_gatt_client.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_gatt_client.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_gatt_server.h b/third_party/android_hardware_libhardware/include/hardware/bt_gatt_server.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_gatt_server.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_gatt_server.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_gatt_types.h b/third_party/android_hardware_libhardware/include/hardware/bt_gatt_types.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_gatt_types.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_gatt_types.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_hd.h b/third_party/android_hardware_libhardware/include/hardware/bt_hd.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_hd.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_hd.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_hf.h b/third_party/android_hardware_libhardware/include/hardware/bt_hf.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_hf.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_hf.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_hf_client.h b/third_party/android_hardware_libhardware/include/hardware/bt_hf_client.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_hf_client.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_hf_client.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_hh.h b/third_party/android_hardware_libhardware/include/hardware/bt_hh.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_hh.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_hh.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_hl.h b/third_party/android_hardware_libhardware/include/hardware/bt_hl.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_hl.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_hl.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_mce.h b/third_party/android_hardware_libhardware/include/hardware/bt_mce.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_mce.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_mce.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_pan.h b/third_party/android_hardware_libhardware/include/hardware/bt_pan.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_pan.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_pan.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_rc.h b/third_party/android_hardware_libhardware/include/hardware/bt_rc.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_rc.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_rc.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_sdp.h b/third_party/android_hardware_libhardware/include/hardware/bt_sdp.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_sdp.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_sdp.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/bt_sock.h b/third_party/android_hardware_libhardware/include/hardware/bt_sock.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/bt_sock.h
rename to third_party/android_hardware_libhardware/include/hardware/bt_sock.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/camera.h b/third_party/android_hardware_libhardware/include/hardware/camera.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/camera.h
rename to third_party/android_hardware_libhardware/include/hardware/camera.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/camera2.h b/third_party/android_hardware_libhardware/include/hardware/camera2.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/camera2.h
rename to third_party/android_hardware_libhardware/include/hardware/camera2.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/camera3.h b/third_party/android_hardware_libhardware/include/hardware/camera3.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/camera3.h
rename to third_party/android_hardware_libhardware/include/hardware/camera3.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/camera_common.h b/third_party/android_hardware_libhardware/include/hardware/camera_common.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/camera_common.h
rename to third_party/android_hardware_libhardware/include/hardware/camera_common.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/consumerir.h b/third_party/android_hardware_libhardware/include/hardware/consumerir.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/consumerir.h
rename to third_party/android_hardware_libhardware/include/hardware/consumerir.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/display_defs.h b/third_party/android_hardware_libhardware/include/hardware/display_defs.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/display_defs.h
rename to third_party/android_hardware_libhardware/include/hardware/display_defs.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/fb.h b/third_party/android_hardware_libhardware/include/hardware/fb.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/fb.h
rename to third_party/android_hardware_libhardware/include/hardware/fb.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/fingerprint.h b/third_party/android_hardware_libhardware/include/hardware/fingerprint.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/fingerprint.h
rename to third_party/android_hardware_libhardware/include/hardware/fingerprint.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/fused_location.h b/third_party/android_hardware_libhardware/include/hardware/fused_location.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/fused_location.h
rename to third_party/android_hardware_libhardware/include/hardware/fused_location.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/gatekeeper.h b/third_party/android_hardware_libhardware/include/hardware/gatekeeper.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/gatekeeper.h
rename to third_party/android_hardware_libhardware/include/hardware/gatekeeper.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/gps.h b/third_party/android_hardware_libhardware/include/hardware/gps.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/gps.h
rename to third_party/android_hardware_libhardware/include/hardware/gps.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/gralloc.h b/third_party/android_hardware_libhardware/include/hardware/gralloc.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/gralloc.h
rename to third_party/android_hardware_libhardware/include/hardware/gralloc.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/hardware.h b/third_party/android_hardware_libhardware/include/hardware/hardware.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/hardware.h
rename to third_party/android_hardware_libhardware/include/hardware/hardware.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/hdmi_cec.h b/third_party/android_hardware_libhardware/include/hardware/hdmi_cec.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/hdmi_cec.h
rename to third_party/android_hardware_libhardware/include/hardware/hdmi_cec.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/hw_auth_token.h b/third_party/android_hardware_libhardware/include/hardware/hw_auth_token.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/hw_auth_token.h
rename to third_party/android_hardware_libhardware/include/hardware/hw_auth_token.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/hwcomposer.h b/third_party/android_hardware_libhardware/include/hardware/hwcomposer.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/hwcomposer.h
rename to third_party/android_hardware_libhardware/include/hardware/hwcomposer.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/hwcomposer_defs.h b/third_party/android_hardware_libhardware/include/hardware/hwcomposer_defs.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/hwcomposer_defs.h
rename to third_party/android_hardware_libhardware/include/hardware/hwcomposer_defs.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/input.h b/third_party/android_hardware_libhardware/include/hardware/input.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/input.h
rename to third_party/android_hardware_libhardware/include/hardware/input.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/keymaster0.h b/third_party/android_hardware_libhardware/include/hardware/keymaster0.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/keymaster0.h
rename to third_party/android_hardware_libhardware/include/hardware/keymaster0.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/keymaster1.h b/third_party/android_hardware_libhardware/include/hardware/keymaster1.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/keymaster1.h
rename to third_party/android_hardware_libhardware/include/hardware/keymaster1.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/keymaster_common.h b/third_party/android_hardware_libhardware/include/hardware/keymaster_common.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/keymaster_common.h
rename to third_party/android_hardware_libhardware/include/hardware/keymaster_common.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/keymaster_defs.h b/third_party/android_hardware_libhardware/include/hardware/keymaster_defs.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/keymaster_defs.h
rename to third_party/android_hardware_libhardware/include/hardware/keymaster_defs.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/lights.h b/third_party/android_hardware_libhardware/include/hardware/lights.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/lights.h
rename to third_party/android_hardware_libhardware/include/hardware/lights.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/local_time_hal.h b/third_party/android_hardware_libhardware/include/hardware/local_time_hal.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/local_time_hal.h
rename to third_party/android_hardware_libhardware/include/hardware/local_time_hal.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/memtrack.h b/third_party/android_hardware_libhardware/include/hardware/memtrack.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/memtrack.h
rename to third_party/android_hardware_libhardware/include/hardware/memtrack.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/nfc.h b/third_party/android_hardware_libhardware/include/hardware/nfc.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/nfc.h
rename to third_party/android_hardware_libhardware/include/hardware/nfc.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/nfc_tag.h b/third_party/android_hardware_libhardware/include/hardware/nfc_tag.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/nfc_tag.h
rename to third_party/android_hardware_libhardware/include/hardware/nfc_tag.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/power.h b/third_party/android_hardware_libhardware/include/hardware/power.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/power.h
rename to third_party/android_hardware_libhardware/include/hardware/power.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/qemu_pipe.h b/third_party/android_hardware_libhardware/include/hardware/qemu_pipe.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/qemu_pipe.h
rename to third_party/android_hardware_libhardware/include/hardware/qemu_pipe.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/qemud.h b/third_party/android_hardware_libhardware/include/hardware/qemud.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/qemud.h
rename to third_party/android_hardware_libhardware/include/hardware/qemud.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/radio.h b/third_party/android_hardware_libhardware/include/hardware/radio.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/radio.h
rename to third_party/android_hardware_libhardware/include/hardware/radio.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/sensors.h b/third_party/android_hardware_libhardware/include/hardware/sensors.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/sensors.h
rename to third_party/android_hardware_libhardware/include/hardware/sensors.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/sound_trigger.h b/third_party/android_hardware_libhardware/include/hardware/sound_trigger.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/sound_trigger.h
rename to third_party/android_hardware_libhardware/include/hardware/sound_trigger.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/tv_input.h b/third_party/android_hardware_libhardware/include/hardware/tv_input.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/tv_input.h
rename to third_party/android_hardware_libhardware/include/hardware/tv_input.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/vibrator.h b/third_party/android_hardware_libhardware/include/hardware/vibrator.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/vibrator.h
rename to third_party/android_hardware_libhardware/include/hardware/vibrator.h
diff --git a/phonelibs/android_hardware_libhardware/include/hardware/wipower.h b/third_party/android_hardware_libhardware/include/hardware/wipower.h
similarity index 100%
rename from phonelibs/android_hardware_libhardware/include/hardware/wipower.h
rename to third_party/android_hardware_libhardware/include/hardware/wipower.h
diff --git a/phonelibs/android_system_core/include/cutils/android_reboot.h b/third_party/android_system_core/include/cutils/android_reboot.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/android_reboot.h
rename to third_party/android_system_core/include/cutils/android_reboot.h
diff --git a/phonelibs/android_system_core/include/cutils/aref.h b/third_party/android_system_core/include/cutils/aref.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/aref.h
rename to third_party/android_system_core/include/cutils/aref.h
diff --git a/phonelibs/android_system_core/include/cutils/ashmem.h b/third_party/android_system_core/include/cutils/ashmem.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/ashmem.h
rename to third_party/android_system_core/include/cutils/ashmem.h
diff --git a/phonelibs/android_system_core/include/cutils/atomic.h b/third_party/android_system_core/include/cutils/atomic.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/atomic.h
rename to third_party/android_system_core/include/cutils/atomic.h
diff --git a/phonelibs/android_system_core/include/cutils/bitops.h b/third_party/android_system_core/include/cutils/bitops.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/bitops.h
rename to third_party/android_system_core/include/cutils/bitops.h
diff --git a/phonelibs/android_system_core/include/cutils/compiler.h b/third_party/android_system_core/include/cutils/compiler.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/compiler.h
rename to third_party/android_system_core/include/cutils/compiler.h
diff --git a/phonelibs/android_system_core/include/cutils/config_utils.h b/third_party/android_system_core/include/cutils/config_utils.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/config_utils.h
rename to third_party/android_system_core/include/cutils/config_utils.h
diff --git a/phonelibs/android_system_core/include/cutils/debugger.h b/third_party/android_system_core/include/cutils/debugger.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/debugger.h
rename to third_party/android_system_core/include/cutils/debugger.h
diff --git a/phonelibs/android_system_core/include/cutils/fs.h b/third_party/android_system_core/include/cutils/fs.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/fs.h
rename to third_party/android_system_core/include/cutils/fs.h
diff --git a/phonelibs/android_system_core/include/cutils/hashmap.h b/third_party/android_system_core/include/cutils/hashmap.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/hashmap.h
rename to third_party/android_system_core/include/cutils/hashmap.h
diff --git a/phonelibs/android_system_core/include/cutils/iosched_policy.h b/third_party/android_system_core/include/cutils/iosched_policy.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/iosched_policy.h
rename to third_party/android_system_core/include/cutils/iosched_policy.h
diff --git a/phonelibs/android_system_core/include/cutils/jstring.h b/third_party/android_system_core/include/cutils/jstring.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/jstring.h
rename to third_party/android_system_core/include/cutils/jstring.h
diff --git a/phonelibs/android_system_core/include/cutils/klog.h b/third_party/android_system_core/include/cutils/klog.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/klog.h
rename to third_party/android_system_core/include/cutils/klog.h
diff --git a/phonelibs/android_system_core/include/cutils/list.h b/third_party/android_system_core/include/cutils/list.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/list.h
rename to third_party/android_system_core/include/cutils/list.h
diff --git a/phonelibs/android_system_core/include/cutils/log.h b/third_party/android_system_core/include/cutils/log.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/log.h
rename to third_party/android_system_core/include/cutils/log.h
diff --git a/phonelibs/android_system_core/include/cutils/memory.h b/third_party/android_system_core/include/cutils/memory.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/memory.h
rename to third_party/android_system_core/include/cutils/memory.h
diff --git a/phonelibs/android_system_core/include/cutils/misc.h b/third_party/android_system_core/include/cutils/misc.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/misc.h
rename to third_party/android_system_core/include/cutils/misc.h
diff --git a/phonelibs/android_system_core/include/cutils/multiuser.h b/third_party/android_system_core/include/cutils/multiuser.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/multiuser.h
rename to third_party/android_system_core/include/cutils/multiuser.h
diff --git a/phonelibs/android_system_core/include/cutils/native_handle.h b/third_party/android_system_core/include/cutils/native_handle.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/native_handle.h
rename to third_party/android_system_core/include/cutils/native_handle.h
diff --git a/phonelibs/android_system_core/include/cutils/open_memstream.h b/third_party/android_system_core/include/cutils/open_memstream.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/open_memstream.h
rename to third_party/android_system_core/include/cutils/open_memstream.h
diff --git a/phonelibs/android_system_core/include/cutils/partition_utils.h b/third_party/android_system_core/include/cutils/partition_utils.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/partition_utils.h
rename to third_party/android_system_core/include/cutils/partition_utils.h
diff --git a/phonelibs/android_system_core/include/cutils/process_name.h b/third_party/android_system_core/include/cutils/process_name.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/process_name.h
rename to third_party/android_system_core/include/cutils/process_name.h
diff --git a/phonelibs/android_system_core/include/cutils/properties.h b/third_party/android_system_core/include/cutils/properties.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/properties.h
rename to third_party/android_system_core/include/cutils/properties.h
diff --git a/phonelibs/android_system_core/include/cutils/qtaguid.h b/third_party/android_system_core/include/cutils/qtaguid.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/qtaguid.h
rename to third_party/android_system_core/include/cutils/qtaguid.h
diff --git a/phonelibs/android_system_core/include/cutils/record_stream.h b/third_party/android_system_core/include/cutils/record_stream.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/record_stream.h
rename to third_party/android_system_core/include/cutils/record_stream.h
diff --git a/phonelibs/android_system_core/include/cutils/sched_policy.h b/third_party/android_system_core/include/cutils/sched_policy.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/sched_policy.h
rename to third_party/android_system_core/include/cutils/sched_policy.h
diff --git a/phonelibs/android_system_core/include/cutils/sockets.h b/third_party/android_system_core/include/cutils/sockets.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/sockets.h
rename to third_party/android_system_core/include/cutils/sockets.h
diff --git a/phonelibs/android_system_core/include/cutils/str_parms.h b/third_party/android_system_core/include/cutils/str_parms.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/str_parms.h
rename to third_party/android_system_core/include/cutils/str_parms.h
diff --git a/phonelibs/android_system_core/include/cutils/threads.h b/third_party/android_system_core/include/cutils/threads.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/threads.h
rename to third_party/android_system_core/include/cutils/threads.h
diff --git a/phonelibs/android_system_core/include/cutils/trace.h b/third_party/android_system_core/include/cutils/trace.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/trace.h
rename to third_party/android_system_core/include/cutils/trace.h
diff --git a/phonelibs/android_system_core/include/cutils/uevent.h b/third_party/android_system_core/include/cutils/uevent.h
similarity index 100%
rename from phonelibs/android_system_core/include/cutils/uevent.h
rename to third_party/android_system_core/include/cutils/uevent.h
diff --git a/phonelibs/android_system_core/include/log/event_tag_map.h b/third_party/android_system_core/include/log/event_tag_map.h
similarity index 100%
rename from phonelibs/android_system_core/include/log/event_tag_map.h
rename to third_party/android_system_core/include/log/event_tag_map.h
diff --git a/phonelibs/android_system_core/include/log/log.h b/third_party/android_system_core/include/log/log.h
similarity index 100%
rename from phonelibs/android_system_core/include/log/log.h
rename to third_party/android_system_core/include/log/log.h
diff --git a/phonelibs/android_system_core/include/log/log_read.h b/third_party/android_system_core/include/log/log_read.h
similarity index 100%
rename from phonelibs/android_system_core/include/log/log_read.h
rename to third_party/android_system_core/include/log/log_read.h
diff --git a/phonelibs/android_system_core/include/log/logd.h b/third_party/android_system_core/include/log/logd.h
similarity index 100%
rename from phonelibs/android_system_core/include/log/logd.h
rename to third_party/android_system_core/include/log/logd.h
diff --git a/phonelibs/android_system_core/include/log/logger.h b/third_party/android_system_core/include/log/logger.h
similarity index 100%
rename from phonelibs/android_system_core/include/log/logger.h
rename to third_party/android_system_core/include/log/logger.h
diff --git a/phonelibs/android_system_core/include/log/logprint.h b/third_party/android_system_core/include/log/logprint.h
similarity index 100%
rename from phonelibs/android_system_core/include/log/logprint.h
rename to third_party/android_system_core/include/log/logprint.h
diff --git a/phonelibs/android_system_core/include/log/uio.h b/third_party/android_system_core/include/log/uio.h
similarity index 100%
rename from phonelibs/android_system_core/include/log/uio.h
rename to third_party/android_system_core/include/log/uio.h
diff --git a/phonelibs/android_system_core/include/system/camera.h b/third_party/android_system_core/include/system/camera.h
similarity index 100%
rename from phonelibs/android_system_core/include/system/camera.h
rename to third_party/android_system_core/include/system/camera.h
diff --git a/phonelibs/android_system_core/include/system/graphics.h b/third_party/android_system_core/include/system/graphics.h
similarity index 100%
rename from phonelibs/android_system_core/include/system/graphics.h
rename to third_party/android_system_core/include/system/graphics.h
diff --git a/phonelibs/android_system_core/include/system/radio.h b/third_party/android_system_core/include/system/radio.h
similarity index 100%
rename from phonelibs/android_system_core/include/system/radio.h
rename to third_party/android_system_core/include/system/radio.h
diff --git a/phonelibs/android_system_core/include/system/thread_defs.h b/third_party/android_system_core/include/system/thread_defs.h
similarity index 100%
rename from phonelibs/android_system_core/include/system/thread_defs.h
rename to third_party/android_system_core/include/system/thread_defs.h
diff --git a/phonelibs/android_system_core/include/system/window.h b/third_party/android_system_core/include/system/window.h
similarity index 100%
rename from phonelibs/android_system_core/include/system/window.h
rename to third_party/android_system_core/include/system/window.h
diff --git a/phonelibs/android_system_core/include/utils/AndroidThreads.h b/third_party/android_system_core/include/utils/AndroidThreads.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/AndroidThreads.h
rename to third_party/android_system_core/include/utils/AndroidThreads.h
diff --git a/phonelibs/android_system_core/include/utils/Atomic.h b/third_party/android_system_core/include/utils/Atomic.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Atomic.h
rename to third_party/android_system_core/include/utils/Atomic.h
diff --git a/phonelibs/android_system_core/include/utils/BasicHashtable.h b/third_party/android_system_core/include/utils/BasicHashtable.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/BasicHashtable.h
rename to third_party/android_system_core/include/utils/BasicHashtable.h
diff --git a/phonelibs/android_system_core/include/utils/BitSet.h b/third_party/android_system_core/include/utils/BitSet.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/BitSet.h
rename to third_party/android_system_core/include/utils/BitSet.h
diff --git a/phonelibs/android_system_core/include/utils/BlobCache.h b/third_party/android_system_core/include/utils/BlobCache.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/BlobCache.h
rename to third_party/android_system_core/include/utils/BlobCache.h
diff --git a/phonelibs/android_system_core/include/utils/ByteOrder.h b/third_party/android_system_core/include/utils/ByteOrder.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/ByteOrder.h
rename to third_party/android_system_core/include/utils/ByteOrder.h
diff --git a/phonelibs/android_system_core/include/utils/CallStack.h b/third_party/android_system_core/include/utils/CallStack.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/CallStack.h
rename to third_party/android_system_core/include/utils/CallStack.h
diff --git a/phonelibs/android_system_core/include/utils/Compat.h b/third_party/android_system_core/include/utils/Compat.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Compat.h
rename to third_party/android_system_core/include/utils/Compat.h
diff --git a/phonelibs/android_system_core/include/utils/Condition.h b/third_party/android_system_core/include/utils/Condition.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Condition.h
rename to third_party/android_system_core/include/utils/Condition.h
diff --git a/phonelibs/android_system_core/include/utils/Debug.h b/third_party/android_system_core/include/utils/Debug.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Debug.h
rename to third_party/android_system_core/include/utils/Debug.h
diff --git a/phonelibs/android_system_core/include/utils/Endian.h b/third_party/android_system_core/include/utils/Endian.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Endian.h
rename to third_party/android_system_core/include/utils/Endian.h
diff --git a/phonelibs/android_system_core/include/utils/Errors.h b/third_party/android_system_core/include/utils/Errors.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Errors.h
rename to third_party/android_system_core/include/utils/Errors.h
diff --git a/phonelibs/android_system_core/include/utils/FileMap.h b/third_party/android_system_core/include/utils/FileMap.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/FileMap.h
rename to third_party/android_system_core/include/utils/FileMap.h
diff --git a/phonelibs/android_system_core/include/utils/Flattenable.h b/third_party/android_system_core/include/utils/Flattenable.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Flattenable.h
rename to third_party/android_system_core/include/utils/Flattenable.h
diff --git a/phonelibs/android_system_core/include/utils/Functor.h b/third_party/android_system_core/include/utils/Functor.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Functor.h
rename to third_party/android_system_core/include/utils/Functor.h
diff --git a/phonelibs/android_system_core/include/utils/JenkinsHash.h b/third_party/android_system_core/include/utils/JenkinsHash.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/JenkinsHash.h
rename to third_party/android_system_core/include/utils/JenkinsHash.h
diff --git a/phonelibs/android_system_core/include/utils/KeyedVector.h b/third_party/android_system_core/include/utils/KeyedVector.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/KeyedVector.h
rename to third_party/android_system_core/include/utils/KeyedVector.h
diff --git a/phonelibs/android_system_core/include/utils/LinearTransform.h b/third_party/android_system_core/include/utils/LinearTransform.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/LinearTransform.h
rename to third_party/android_system_core/include/utils/LinearTransform.h
diff --git a/phonelibs/android_system_core/include/utils/List.h b/third_party/android_system_core/include/utils/List.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/List.h
rename to third_party/android_system_core/include/utils/List.h
diff --git a/phonelibs/android_system_core/include/utils/Log.h b/third_party/android_system_core/include/utils/Log.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Log.h
rename to third_party/android_system_core/include/utils/Log.h
diff --git a/phonelibs/android_system_core/include/utils/Looper.h b/third_party/android_system_core/include/utils/Looper.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Looper.h
rename to third_party/android_system_core/include/utils/Looper.h
diff --git a/phonelibs/android_system_core/include/utils/LruCache.h b/third_party/android_system_core/include/utils/LruCache.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/LruCache.h
rename to third_party/android_system_core/include/utils/LruCache.h
diff --git a/phonelibs/android_system_core/include/utils/Mutex.h b/third_party/android_system_core/include/utils/Mutex.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Mutex.h
rename to third_party/android_system_core/include/utils/Mutex.h
diff --git a/phonelibs/android_system_core/include/utils/NativeHandle.h b/third_party/android_system_core/include/utils/NativeHandle.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/NativeHandle.h
rename to third_party/android_system_core/include/utils/NativeHandle.h
diff --git a/phonelibs/android_system_core/include/utils/Printer.h b/third_party/android_system_core/include/utils/Printer.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Printer.h
rename to third_party/android_system_core/include/utils/Printer.h
diff --git a/phonelibs/android_system_core/include/utils/ProcessCallStack.h b/third_party/android_system_core/include/utils/ProcessCallStack.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/ProcessCallStack.h
rename to third_party/android_system_core/include/utils/ProcessCallStack.h
diff --git a/phonelibs/android_system_core/include/utils/PropertyMap.h b/third_party/android_system_core/include/utils/PropertyMap.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/PropertyMap.h
rename to third_party/android_system_core/include/utils/PropertyMap.h
diff --git a/phonelibs/android_system_core/include/utils/RWLock.h b/third_party/android_system_core/include/utils/RWLock.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/RWLock.h
rename to third_party/android_system_core/include/utils/RWLock.h
diff --git a/phonelibs/android_system_core/include/utils/RefBase.h b/third_party/android_system_core/include/utils/RefBase.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/RefBase.h
rename to third_party/android_system_core/include/utils/RefBase.h
diff --git a/phonelibs/android_system_core/include/utils/SharedBuffer.h b/third_party/android_system_core/include/utils/SharedBuffer.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/SharedBuffer.h
rename to third_party/android_system_core/include/utils/SharedBuffer.h
diff --git a/phonelibs/android_system_core/include/utils/Singleton.h b/third_party/android_system_core/include/utils/Singleton.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Singleton.h
rename to third_party/android_system_core/include/utils/Singleton.h
diff --git a/phonelibs/android_system_core/include/utils/SortedVector.h b/third_party/android_system_core/include/utils/SortedVector.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/SortedVector.h
rename to third_party/android_system_core/include/utils/SortedVector.h
diff --git a/phonelibs/android_system_core/include/utils/StopWatch.h b/third_party/android_system_core/include/utils/StopWatch.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/StopWatch.h
rename to third_party/android_system_core/include/utils/StopWatch.h
diff --git a/phonelibs/android_system_core/include/utils/String16.h b/third_party/android_system_core/include/utils/String16.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/String16.h
rename to third_party/android_system_core/include/utils/String16.h
diff --git a/phonelibs/android_system_core/include/utils/String8.h b/third_party/android_system_core/include/utils/String8.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/String8.h
rename to third_party/android_system_core/include/utils/String8.h
diff --git a/phonelibs/android_system_core/include/utils/StrongPointer.h b/third_party/android_system_core/include/utils/StrongPointer.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/StrongPointer.h
rename to third_party/android_system_core/include/utils/StrongPointer.h
diff --git a/phonelibs/android_system_core/include/utils/SystemClock.h b/third_party/android_system_core/include/utils/SystemClock.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/SystemClock.h
rename to third_party/android_system_core/include/utils/SystemClock.h
diff --git a/phonelibs/android_system_core/include/utils/Thread.h b/third_party/android_system_core/include/utils/Thread.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Thread.h
rename to third_party/android_system_core/include/utils/Thread.h
diff --git a/phonelibs/android_system_core/include/utils/ThreadDefs.h b/third_party/android_system_core/include/utils/ThreadDefs.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/ThreadDefs.h
rename to third_party/android_system_core/include/utils/ThreadDefs.h
diff --git a/phonelibs/android_system_core/include/utils/Timers.h b/third_party/android_system_core/include/utils/Timers.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Timers.h
rename to third_party/android_system_core/include/utils/Timers.h
diff --git a/phonelibs/android_system_core/include/utils/Tokenizer.h b/third_party/android_system_core/include/utils/Tokenizer.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Tokenizer.h
rename to third_party/android_system_core/include/utils/Tokenizer.h
diff --git a/phonelibs/android_system_core/include/utils/Trace.h b/third_party/android_system_core/include/utils/Trace.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Trace.h
rename to third_party/android_system_core/include/utils/Trace.h
diff --git a/phonelibs/android_system_core/include/utils/TypeHelpers.h b/third_party/android_system_core/include/utils/TypeHelpers.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/TypeHelpers.h
rename to third_party/android_system_core/include/utils/TypeHelpers.h
diff --git a/phonelibs/android_system_core/include/utils/Unicode.h b/third_party/android_system_core/include/utils/Unicode.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Unicode.h
rename to third_party/android_system_core/include/utils/Unicode.h
diff --git a/phonelibs/android_system_core/include/utils/Vector.h b/third_party/android_system_core/include/utils/Vector.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/Vector.h
rename to third_party/android_system_core/include/utils/Vector.h
diff --git a/phonelibs/android_system_core/include/utils/VectorImpl.h b/third_party/android_system_core/include/utils/VectorImpl.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/VectorImpl.h
rename to third_party/android_system_core/include/utils/VectorImpl.h
diff --git a/phonelibs/android_system_core/include/utils/ashmem.h b/third_party/android_system_core/include/utils/ashmem.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/ashmem.h
rename to third_party/android_system_core/include/utils/ashmem.h
diff --git a/phonelibs/android_system_core/include/utils/misc.h b/third_party/android_system_core/include/utils/misc.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/misc.h
rename to third_party/android_system_core/include/utils/misc.h
diff --git a/phonelibs/android_system_core/include/utils/threads.h b/third_party/android_system_core/include/utils/threads.h
similarity index 100%
rename from phonelibs/android_system_core/include/utils/threads.h
rename to third_party/android_system_core/include/utils/threads.h
diff --git a/phonelibs/boringssl/LICENSE b/third_party/boringssl/LICENSE
similarity index 100%
rename from phonelibs/boringssl/LICENSE
rename to third_party/boringssl/LICENSE
diff --git a/phonelibs/boringssl/LICENSE.boringssl b/third_party/boringssl/LICENSE.boringssl
similarity index 100%
rename from phonelibs/boringssl/LICENSE.boringssl
rename to third_party/boringssl/LICENSE.boringssl
diff --git a/phonelibs/boringssl/build.txt b/third_party/boringssl/build.txt
similarity index 100%
rename from phonelibs/boringssl/build.txt
rename to third_party/boringssl/build.txt
diff --git a/phonelibs/boringssl/include/openssl/aead.h b/third_party/boringssl/include/openssl/aead.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/aead.h
rename to third_party/boringssl/include/openssl/aead.h
diff --git a/phonelibs/boringssl/include/openssl/aes.h b/third_party/boringssl/include/openssl/aes.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/aes.h
rename to third_party/boringssl/include/openssl/aes.h
diff --git a/phonelibs/boringssl/include/openssl/asn1.h b/third_party/boringssl/include/openssl/asn1.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/asn1.h
rename to third_party/boringssl/include/openssl/asn1.h
diff --git a/phonelibs/boringssl/include/openssl/asn1_mac.h b/third_party/boringssl/include/openssl/asn1_mac.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/asn1_mac.h
rename to third_party/boringssl/include/openssl/asn1_mac.h
diff --git a/phonelibs/boringssl/include/openssl/asn1t.h b/third_party/boringssl/include/openssl/asn1t.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/asn1t.h
rename to third_party/boringssl/include/openssl/asn1t.h
diff --git a/phonelibs/boringssl/include/openssl/base.h b/third_party/boringssl/include/openssl/base.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/base.h
rename to third_party/boringssl/include/openssl/base.h
diff --git a/phonelibs/boringssl/include/openssl/base64.h b/third_party/boringssl/include/openssl/base64.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/base64.h
rename to third_party/boringssl/include/openssl/base64.h
diff --git a/phonelibs/boringssl/include/openssl/bio.h b/third_party/boringssl/include/openssl/bio.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/bio.h
rename to third_party/boringssl/include/openssl/bio.h
diff --git a/phonelibs/boringssl/include/openssl/blowfish.h b/third_party/boringssl/include/openssl/blowfish.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/blowfish.h
rename to third_party/boringssl/include/openssl/blowfish.h
diff --git a/phonelibs/boringssl/include/openssl/bn.h b/third_party/boringssl/include/openssl/bn.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/bn.h
rename to third_party/boringssl/include/openssl/bn.h
diff --git a/phonelibs/boringssl/include/openssl/buf.h b/third_party/boringssl/include/openssl/buf.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/buf.h
rename to third_party/boringssl/include/openssl/buf.h
diff --git a/phonelibs/boringssl/include/openssl/buffer.h b/third_party/boringssl/include/openssl/buffer.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/buffer.h
rename to third_party/boringssl/include/openssl/buffer.h
diff --git a/phonelibs/boringssl/include/openssl/bytestring.h b/third_party/boringssl/include/openssl/bytestring.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/bytestring.h
rename to third_party/boringssl/include/openssl/bytestring.h
diff --git a/phonelibs/boringssl/include/openssl/cast.h b/third_party/boringssl/include/openssl/cast.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/cast.h
rename to third_party/boringssl/include/openssl/cast.h
diff --git a/phonelibs/boringssl/include/openssl/chacha.h b/third_party/boringssl/include/openssl/chacha.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/chacha.h
rename to third_party/boringssl/include/openssl/chacha.h
diff --git a/phonelibs/boringssl/include/openssl/cipher.h b/third_party/boringssl/include/openssl/cipher.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/cipher.h
rename to third_party/boringssl/include/openssl/cipher.h
diff --git a/phonelibs/boringssl/include/openssl/cmac.h b/third_party/boringssl/include/openssl/cmac.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/cmac.h
rename to third_party/boringssl/include/openssl/cmac.h
diff --git a/phonelibs/boringssl/include/openssl/conf.h b/third_party/boringssl/include/openssl/conf.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/conf.h
rename to third_party/boringssl/include/openssl/conf.h
diff --git a/phonelibs/boringssl/include/openssl/cpu.h b/third_party/boringssl/include/openssl/cpu.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/cpu.h
rename to third_party/boringssl/include/openssl/cpu.h
diff --git a/phonelibs/boringssl/include/openssl/crypto.h b/third_party/boringssl/include/openssl/crypto.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/crypto.h
rename to third_party/boringssl/include/openssl/crypto.h
diff --git a/phonelibs/boringssl/include/openssl/des.h b/third_party/boringssl/include/openssl/des.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/des.h
rename to third_party/boringssl/include/openssl/des.h
diff --git a/phonelibs/boringssl/include/openssl/dh.h b/third_party/boringssl/include/openssl/dh.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/dh.h
rename to third_party/boringssl/include/openssl/dh.h
diff --git a/phonelibs/boringssl/include/openssl/digest.h b/third_party/boringssl/include/openssl/digest.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/digest.h
rename to third_party/boringssl/include/openssl/digest.h
diff --git a/phonelibs/boringssl/include/openssl/dsa.h b/third_party/boringssl/include/openssl/dsa.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/dsa.h
rename to third_party/boringssl/include/openssl/dsa.h
diff --git a/phonelibs/boringssl/include/openssl/dtls1.h b/third_party/boringssl/include/openssl/dtls1.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/dtls1.h
rename to third_party/boringssl/include/openssl/dtls1.h
diff --git a/phonelibs/boringssl/include/openssl/ec.h b/third_party/boringssl/include/openssl/ec.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ec.h
rename to third_party/boringssl/include/openssl/ec.h
diff --git a/phonelibs/boringssl/include/openssl/ec_key.h b/third_party/boringssl/include/openssl/ec_key.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ec_key.h
rename to third_party/boringssl/include/openssl/ec_key.h
diff --git a/phonelibs/boringssl/include/openssl/ecdh.h b/third_party/boringssl/include/openssl/ecdh.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ecdh.h
rename to third_party/boringssl/include/openssl/ecdh.h
diff --git a/phonelibs/boringssl/include/openssl/ecdsa.h b/third_party/boringssl/include/openssl/ecdsa.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ecdsa.h
rename to third_party/boringssl/include/openssl/ecdsa.h
diff --git a/phonelibs/boringssl/include/openssl/engine.h b/third_party/boringssl/include/openssl/engine.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/engine.h
rename to third_party/boringssl/include/openssl/engine.h
diff --git a/phonelibs/boringssl/include/openssl/err.h b/third_party/boringssl/include/openssl/err.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/err.h
rename to third_party/boringssl/include/openssl/err.h
diff --git a/phonelibs/boringssl/include/openssl/evp.h b/third_party/boringssl/include/openssl/evp.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/evp.h
rename to third_party/boringssl/include/openssl/evp.h
diff --git a/phonelibs/boringssl/include/openssl/ex_data.h b/third_party/boringssl/include/openssl/ex_data.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ex_data.h
rename to third_party/boringssl/include/openssl/ex_data.h
diff --git a/phonelibs/boringssl/include/openssl/hkdf.h b/third_party/boringssl/include/openssl/hkdf.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/hkdf.h
rename to third_party/boringssl/include/openssl/hkdf.h
diff --git a/phonelibs/boringssl/include/openssl/hmac.h b/third_party/boringssl/include/openssl/hmac.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/hmac.h
rename to third_party/boringssl/include/openssl/hmac.h
diff --git a/phonelibs/boringssl/include/openssl/lhash.h b/third_party/boringssl/include/openssl/lhash.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/lhash.h
rename to third_party/boringssl/include/openssl/lhash.h
diff --git a/phonelibs/boringssl/include/openssl/lhash_macros.h b/third_party/boringssl/include/openssl/lhash_macros.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/lhash_macros.h
rename to third_party/boringssl/include/openssl/lhash_macros.h
diff --git a/phonelibs/boringssl/include/openssl/md4.h b/third_party/boringssl/include/openssl/md4.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/md4.h
rename to third_party/boringssl/include/openssl/md4.h
diff --git a/phonelibs/boringssl/include/openssl/md5.h b/third_party/boringssl/include/openssl/md5.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/md5.h
rename to third_party/boringssl/include/openssl/md5.h
diff --git a/phonelibs/boringssl/include/openssl/mem.h b/third_party/boringssl/include/openssl/mem.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/mem.h
rename to third_party/boringssl/include/openssl/mem.h
diff --git a/phonelibs/boringssl/include/openssl/modes.h b/third_party/boringssl/include/openssl/modes.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/modes.h
rename to third_party/boringssl/include/openssl/modes.h
diff --git a/phonelibs/boringssl/include/openssl/obj.h b/third_party/boringssl/include/openssl/obj.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/obj.h
rename to third_party/boringssl/include/openssl/obj.h
diff --git a/phonelibs/boringssl/include/openssl/obj_mac.h b/third_party/boringssl/include/openssl/obj_mac.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/obj_mac.h
rename to third_party/boringssl/include/openssl/obj_mac.h
diff --git a/phonelibs/boringssl/include/openssl/objects.h b/third_party/boringssl/include/openssl/objects.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/objects.h
rename to third_party/boringssl/include/openssl/objects.h
diff --git a/phonelibs/boringssl/include/openssl/opensslfeatures.h b/third_party/boringssl/include/openssl/opensslfeatures.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/opensslfeatures.h
rename to third_party/boringssl/include/openssl/opensslfeatures.h
diff --git a/phonelibs/boringssl/include/openssl/opensslv.h b/third_party/boringssl/include/openssl/opensslv.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/opensslv.h
rename to third_party/boringssl/include/openssl/opensslv.h
diff --git a/phonelibs/boringssl/include/openssl/ossl_typ.h b/third_party/boringssl/include/openssl/ossl_typ.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ossl_typ.h
rename to third_party/boringssl/include/openssl/ossl_typ.h
diff --git a/phonelibs/boringssl/include/openssl/pem.h b/third_party/boringssl/include/openssl/pem.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/pem.h
rename to third_party/boringssl/include/openssl/pem.h
diff --git a/phonelibs/boringssl/include/openssl/pkcs12.h b/third_party/boringssl/include/openssl/pkcs12.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/pkcs12.h
rename to third_party/boringssl/include/openssl/pkcs12.h
diff --git a/phonelibs/boringssl/include/openssl/pkcs7.h b/third_party/boringssl/include/openssl/pkcs7.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/pkcs7.h
rename to third_party/boringssl/include/openssl/pkcs7.h
diff --git a/phonelibs/boringssl/include/openssl/pkcs8.h b/third_party/boringssl/include/openssl/pkcs8.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/pkcs8.h
rename to third_party/boringssl/include/openssl/pkcs8.h
diff --git a/phonelibs/boringssl/include/openssl/poly1305.h b/third_party/boringssl/include/openssl/poly1305.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/poly1305.h
rename to third_party/boringssl/include/openssl/poly1305.h
diff --git a/phonelibs/boringssl/include/openssl/pqueue.h b/third_party/boringssl/include/openssl/pqueue.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/pqueue.h
rename to third_party/boringssl/include/openssl/pqueue.h
diff --git a/phonelibs/boringssl/include/openssl/rand.h b/third_party/boringssl/include/openssl/rand.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/rand.h
rename to third_party/boringssl/include/openssl/rand.h
diff --git a/phonelibs/boringssl/include/openssl/rc4.h b/third_party/boringssl/include/openssl/rc4.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/rc4.h
rename to third_party/boringssl/include/openssl/rc4.h
diff --git a/phonelibs/boringssl/include/openssl/rsa.h b/third_party/boringssl/include/openssl/rsa.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/rsa.h
rename to third_party/boringssl/include/openssl/rsa.h
diff --git a/phonelibs/boringssl/include/openssl/safestack.h b/third_party/boringssl/include/openssl/safestack.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/safestack.h
rename to third_party/boringssl/include/openssl/safestack.h
diff --git a/phonelibs/boringssl/include/openssl/sha.h b/third_party/boringssl/include/openssl/sha.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/sha.h
rename to third_party/boringssl/include/openssl/sha.h
diff --git a/phonelibs/boringssl/include/openssl/srtp.h b/third_party/boringssl/include/openssl/srtp.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/srtp.h
rename to third_party/boringssl/include/openssl/srtp.h
diff --git a/phonelibs/boringssl/include/openssl/ssl.h b/third_party/boringssl/include/openssl/ssl.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ssl.h
rename to third_party/boringssl/include/openssl/ssl.h
diff --git a/phonelibs/boringssl/include/openssl/ssl2.h b/third_party/boringssl/include/openssl/ssl2.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ssl2.h
rename to third_party/boringssl/include/openssl/ssl2.h
diff --git a/phonelibs/boringssl/include/openssl/ssl23.h b/third_party/boringssl/include/openssl/ssl23.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ssl23.h
rename to third_party/boringssl/include/openssl/ssl23.h
diff --git a/phonelibs/boringssl/include/openssl/ssl3.h b/third_party/boringssl/include/openssl/ssl3.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/ssl3.h
rename to third_party/boringssl/include/openssl/ssl3.h
diff --git a/phonelibs/boringssl/include/openssl/stack.h b/third_party/boringssl/include/openssl/stack.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/stack.h
rename to third_party/boringssl/include/openssl/stack.h
diff --git a/phonelibs/boringssl/include/openssl/stack_macros.h b/third_party/boringssl/include/openssl/stack_macros.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/stack_macros.h
rename to third_party/boringssl/include/openssl/stack_macros.h
diff --git a/phonelibs/boringssl/include/openssl/thread.h b/third_party/boringssl/include/openssl/thread.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/thread.h
rename to third_party/boringssl/include/openssl/thread.h
diff --git a/phonelibs/boringssl/include/openssl/time_support.h b/third_party/boringssl/include/openssl/time_support.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/time_support.h
rename to third_party/boringssl/include/openssl/time_support.h
diff --git a/phonelibs/boringssl/include/openssl/tls1.h b/third_party/boringssl/include/openssl/tls1.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/tls1.h
rename to third_party/boringssl/include/openssl/tls1.h
diff --git a/phonelibs/boringssl/include/openssl/type_check.h b/third_party/boringssl/include/openssl/type_check.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/type_check.h
rename to third_party/boringssl/include/openssl/type_check.h
diff --git a/phonelibs/boringssl/include/openssl/x509.h b/third_party/boringssl/include/openssl/x509.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/x509.h
rename to third_party/boringssl/include/openssl/x509.h
diff --git a/phonelibs/boringssl/include/openssl/x509_vfy.h b/third_party/boringssl/include/openssl/x509_vfy.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/x509_vfy.h
rename to third_party/boringssl/include/openssl/x509_vfy.h
diff --git a/phonelibs/boringssl/include/openssl/x509v3.h b/third_party/boringssl/include/openssl/x509v3.h
similarity index 100%
rename from phonelibs/boringssl/include/openssl/x509v3.h
rename to third_party/boringssl/include/openssl/x509v3.h
diff --git a/phonelibs/boringssl/lib/libcrypto_static.a b/third_party/boringssl/lib/libcrypto_static.a
similarity index 100%
rename from phonelibs/boringssl/lib/libcrypto_static.a
rename to third_party/boringssl/lib/libcrypto_static.a
diff --git a/phonelibs/boringssl/lib/libssl_static.a b/third_party/boringssl/lib/libssl_static.a
similarity index 100%
rename from phonelibs/boringssl/lib/libssl_static.a
rename to third_party/boringssl/lib/libssl_static.a
diff --git a/phonelibs/bzip2/LICENSE b/third_party/bzip2/LICENSE
similarity index 100%
rename from phonelibs/bzip2/LICENSE
rename to third_party/bzip2/LICENSE
diff --git a/phonelibs/bzip2/build.txt b/third_party/bzip2/build.txt
similarity index 100%
rename from phonelibs/bzip2/build.txt
rename to third_party/bzip2/build.txt
diff --git a/phonelibs/bzip2/bzlib.h b/third_party/bzip2/bzlib.h
similarity index 100%
rename from phonelibs/bzip2/bzlib.h
rename to third_party/bzip2/bzlib.h
diff --git a/phonelibs/bzip2/libbz2.a b/third_party/bzip2/libbz2.a
similarity index 100%
rename from phonelibs/bzip2/libbz2.a
rename to third_party/bzip2/libbz2.a
diff --git a/phonelibs/catch2/include/catch2/catch.hpp b/third_party/catch2/include/catch2/catch.hpp
similarity index 100%
rename from phonelibs/catch2/include/catch2/catch.hpp
rename to third_party/catch2/include/catch2/catch.hpp
diff --git a/phonelibs/catch2/include/catch2/catch_reporter_automake.hpp b/third_party/catch2/include/catch2/catch_reporter_automake.hpp
similarity index 100%
rename from phonelibs/catch2/include/catch2/catch_reporter_automake.hpp
rename to third_party/catch2/include/catch2/catch_reporter_automake.hpp
diff --git a/phonelibs/catch2/include/catch2/catch_reporter_sonarqube.hpp b/third_party/catch2/include/catch2/catch_reporter_sonarqube.hpp
similarity index 100%
rename from phonelibs/catch2/include/catch2/catch_reporter_sonarqube.hpp
rename to third_party/catch2/include/catch2/catch_reporter_sonarqube.hpp
diff --git a/phonelibs/catch2/include/catch2/catch_reporter_tap.hpp b/third_party/catch2/include/catch2/catch_reporter_tap.hpp
similarity index 100%
rename from phonelibs/catch2/include/catch2/catch_reporter_tap.hpp
rename to third_party/catch2/include/catch2/catch_reporter_tap.hpp
diff --git a/phonelibs/catch2/include/catch2/catch_reporter_teamcity.hpp b/third_party/catch2/include/catch2/catch_reporter_teamcity.hpp
similarity index 100%
rename from phonelibs/catch2/include/catch2/catch_reporter_teamcity.hpp
rename to third_party/catch2/include/catch2/catch_reporter_teamcity.hpp
diff --git a/phonelibs/curl/build.txt b/third_party/curl/build.txt
similarity index 100%
rename from phonelibs/curl/build.txt
rename to third_party/curl/build.txt
diff --git a/phonelibs/curl/include/Makefile.am b/third_party/curl/include/Makefile.am
similarity index 100%
rename from phonelibs/curl/include/Makefile.am
rename to third_party/curl/include/Makefile.am
diff --git a/phonelibs/curl/include/README b/third_party/curl/include/README
similarity index 100%
rename from phonelibs/curl/include/README
rename to third_party/curl/include/README
diff --git a/phonelibs/curl/include/curl/.gitignore b/third_party/curl/include/curl/.gitignore
similarity index 100%
rename from phonelibs/curl/include/curl/.gitignore
rename to third_party/curl/include/curl/.gitignore
diff --git a/phonelibs/curl/include/curl/Makefile.am b/third_party/curl/include/curl/Makefile.am
similarity index 100%
rename from phonelibs/curl/include/curl/Makefile.am
rename to third_party/curl/include/curl/Makefile.am
diff --git a/phonelibs/curl/include/curl/curl.h b/third_party/curl/include/curl/curl.h
similarity index 100%
rename from phonelibs/curl/include/curl/curl.h
rename to third_party/curl/include/curl/curl.h
diff --git a/phonelibs/curl/include/curl/curlbuild.h b/third_party/curl/include/curl/curlbuild.h
similarity index 100%
rename from phonelibs/curl/include/curl/curlbuild.h
rename to third_party/curl/include/curl/curlbuild.h
diff --git a/phonelibs/curl/include/curl/curlbuild.h.cmake b/third_party/curl/include/curl/curlbuild.h.cmake
similarity index 100%
rename from phonelibs/curl/include/curl/curlbuild.h.cmake
rename to third_party/curl/include/curl/curlbuild.h.cmake
diff --git a/phonelibs/curl/include/curl/curlbuild.h.dist b/third_party/curl/include/curl/curlbuild.h.dist
similarity index 100%
rename from phonelibs/curl/include/curl/curlbuild.h.dist
rename to third_party/curl/include/curl/curlbuild.h.dist
diff --git a/phonelibs/curl/include/curl/curlbuild.h.in b/third_party/curl/include/curl/curlbuild.h.in
similarity index 100%
rename from phonelibs/curl/include/curl/curlbuild.h.in
rename to third_party/curl/include/curl/curlbuild.h.in
diff --git a/phonelibs/curl/include/curl/curlrules.h b/third_party/curl/include/curl/curlrules.h
similarity index 100%
rename from phonelibs/curl/include/curl/curlrules.h
rename to third_party/curl/include/curl/curlrules.h
diff --git a/phonelibs/curl/include/curl/curlver.h b/third_party/curl/include/curl/curlver.h
similarity index 100%
rename from phonelibs/curl/include/curl/curlver.h
rename to third_party/curl/include/curl/curlver.h
diff --git a/phonelibs/curl/include/curl/easy.h b/third_party/curl/include/curl/easy.h
similarity index 100%
rename from phonelibs/curl/include/curl/easy.h
rename to third_party/curl/include/curl/easy.h
diff --git a/phonelibs/curl/include/curl/mprintf.h b/third_party/curl/include/curl/mprintf.h
similarity index 100%
rename from phonelibs/curl/include/curl/mprintf.h
rename to third_party/curl/include/curl/mprintf.h
diff --git a/phonelibs/curl/include/curl/multi.h b/third_party/curl/include/curl/multi.h
similarity index 100%
rename from phonelibs/curl/include/curl/multi.h
rename to third_party/curl/include/curl/multi.h
diff --git a/phonelibs/curl/include/curl/stdcheaders.h b/third_party/curl/include/curl/stdcheaders.h
similarity index 100%
rename from phonelibs/curl/include/curl/stdcheaders.h
rename to third_party/curl/include/curl/stdcheaders.h
diff --git a/phonelibs/curl/include/curl/typecheck-gcc.h b/third_party/curl/include/curl/typecheck-gcc.h
similarity index 100%
rename from phonelibs/curl/include/curl/typecheck-gcc.h
rename to third_party/curl/include/curl/typecheck-gcc.h
diff --git a/phonelibs/curl/lib/libcurl.a b/third_party/curl/lib/libcurl.a
similarity index 100%
rename from phonelibs/curl/lib/libcurl.a
rename to third_party/curl/lib/libcurl.a
diff --git a/phonelibs/json11/json11.cpp b/third_party/json11/json11.cpp
similarity index 100%
rename from phonelibs/json11/json11.cpp
rename to third_party/json11/json11.cpp
diff --git a/phonelibs/json11/json11.hpp b/third_party/json11/json11.hpp
similarity index 100%
rename from phonelibs/json11/json11.hpp
rename to third_party/json11/json11.hpp
diff --git a/phonelibs/kaitai/custom_decoder.h b/third_party/kaitai/custom_decoder.h
similarity index 100%
rename from phonelibs/kaitai/custom_decoder.h
rename to third_party/kaitai/custom_decoder.h
diff --git a/phonelibs/kaitai/exceptions.h b/third_party/kaitai/exceptions.h
similarity index 100%
rename from phonelibs/kaitai/exceptions.h
rename to third_party/kaitai/exceptions.h
diff --git a/phonelibs/kaitai/kaitaistream.cpp b/third_party/kaitai/kaitaistream.cpp
similarity index 100%
rename from phonelibs/kaitai/kaitaistream.cpp
rename to third_party/kaitai/kaitaistream.cpp
diff --git a/phonelibs/kaitai/kaitaistream.h b/third_party/kaitai/kaitaistream.h
similarity index 100%
rename from phonelibs/kaitai/kaitaistream.h
rename to third_party/kaitai/kaitaistream.h
diff --git a/phonelibs/kaitai/kaitaistruct.h b/third_party/kaitai/kaitaistruct.h
similarity index 100%
rename from phonelibs/kaitai/kaitaistruct.h
rename to third_party/kaitai/kaitaistruct.h
diff --git a/phonelibs/libgralloc/include/gralloc_priv.h b/third_party/libgralloc/include/gralloc_priv.h
similarity index 100%
rename from phonelibs/libgralloc/include/gralloc_priv.h
rename to third_party/libgralloc/include/gralloc_priv.h
diff --git a/phonelibs/libyuv/LICENSE b/third_party/libyuv/LICENSE
similarity index 100%
rename from phonelibs/libyuv/LICENSE
rename to third_party/libyuv/LICENSE
diff --git a/phonelibs/libyuv/LICENSE.libyuv b/third_party/libyuv/LICENSE.libyuv
similarity index 100%
rename from phonelibs/libyuv/LICENSE.libyuv
rename to third_party/libyuv/LICENSE.libyuv
diff --git a/phonelibs/libyuv/build.txt b/third_party/libyuv/build.txt
similarity index 100%
rename from phonelibs/libyuv/build.txt
rename to third_party/libyuv/build.txt
diff --git a/phonelibs/libyuv/include/libyuv.h b/third_party/libyuv/include/libyuv.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv.h
rename to third_party/libyuv/include/libyuv.h
diff --git a/phonelibs/libyuv/include/libyuv/basic_types.h b/third_party/libyuv/include/libyuv/basic_types.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/basic_types.h
rename to third_party/libyuv/include/libyuv/basic_types.h
diff --git a/phonelibs/libyuv/include/libyuv/compare.h b/third_party/libyuv/include/libyuv/compare.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/compare.h
rename to third_party/libyuv/include/libyuv/compare.h
diff --git a/phonelibs/libyuv/include/libyuv/compare_row.h b/third_party/libyuv/include/libyuv/compare_row.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/compare_row.h
rename to third_party/libyuv/include/libyuv/compare_row.h
diff --git a/phonelibs/libyuv/include/libyuv/convert.h b/third_party/libyuv/include/libyuv/convert.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/convert.h
rename to third_party/libyuv/include/libyuv/convert.h
diff --git a/phonelibs/libyuv/include/libyuv/convert_argb.h b/third_party/libyuv/include/libyuv/convert_argb.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/convert_argb.h
rename to third_party/libyuv/include/libyuv/convert_argb.h
diff --git a/phonelibs/libyuv/include/libyuv/convert_from.h b/third_party/libyuv/include/libyuv/convert_from.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/convert_from.h
rename to third_party/libyuv/include/libyuv/convert_from.h
diff --git a/phonelibs/libyuv/include/libyuv/convert_from_argb.h b/third_party/libyuv/include/libyuv/convert_from_argb.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/convert_from_argb.h
rename to third_party/libyuv/include/libyuv/convert_from_argb.h
diff --git a/phonelibs/libyuv/include/libyuv/cpu_id.h b/third_party/libyuv/include/libyuv/cpu_id.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/cpu_id.h
rename to third_party/libyuv/include/libyuv/cpu_id.h
diff --git a/phonelibs/libyuv/include/libyuv/macros_msa.h b/third_party/libyuv/include/libyuv/macros_msa.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/macros_msa.h
rename to third_party/libyuv/include/libyuv/macros_msa.h
diff --git a/phonelibs/libyuv/include/libyuv/mjpeg_decoder.h b/third_party/libyuv/include/libyuv/mjpeg_decoder.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/mjpeg_decoder.h
rename to third_party/libyuv/include/libyuv/mjpeg_decoder.h
diff --git a/phonelibs/libyuv/include/libyuv/planar_functions.h b/third_party/libyuv/include/libyuv/planar_functions.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/planar_functions.h
rename to third_party/libyuv/include/libyuv/planar_functions.h
diff --git a/phonelibs/libyuv/include/libyuv/rotate.h b/third_party/libyuv/include/libyuv/rotate.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/rotate.h
rename to third_party/libyuv/include/libyuv/rotate.h
diff --git a/phonelibs/libyuv/include/libyuv/rotate_argb.h b/third_party/libyuv/include/libyuv/rotate_argb.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/rotate_argb.h
rename to third_party/libyuv/include/libyuv/rotate_argb.h
diff --git a/phonelibs/libyuv/include/libyuv/rotate_row.h b/third_party/libyuv/include/libyuv/rotate_row.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/rotate_row.h
rename to third_party/libyuv/include/libyuv/rotate_row.h
diff --git a/phonelibs/libyuv/include/libyuv/row.h b/third_party/libyuv/include/libyuv/row.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/row.h
rename to third_party/libyuv/include/libyuv/row.h
diff --git a/phonelibs/libyuv/include/libyuv/scale.h b/third_party/libyuv/include/libyuv/scale.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/scale.h
rename to third_party/libyuv/include/libyuv/scale.h
diff --git a/phonelibs/libyuv/include/libyuv/scale_argb.h b/third_party/libyuv/include/libyuv/scale_argb.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/scale_argb.h
rename to third_party/libyuv/include/libyuv/scale_argb.h
diff --git a/phonelibs/libyuv/include/libyuv/scale_row.h b/third_party/libyuv/include/libyuv/scale_row.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/scale_row.h
rename to third_party/libyuv/include/libyuv/scale_row.h
diff --git a/phonelibs/libyuv/include/libyuv/version.h b/third_party/libyuv/include/libyuv/version.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/version.h
rename to third_party/libyuv/include/libyuv/version.h
diff --git a/phonelibs/libyuv/include/libyuv/video_common.h b/third_party/libyuv/include/libyuv/video_common.h
similarity index 100%
rename from phonelibs/libyuv/include/libyuv/video_common.h
rename to third_party/libyuv/include/libyuv/video_common.h
diff --git a/phonelibs/libyuv/larch64/lib/libyuv.a b/third_party/libyuv/larch64/lib/libyuv.a
similarity index 100%
rename from phonelibs/libyuv/larch64/lib/libyuv.a
rename to third_party/libyuv/larch64/lib/libyuv.a
diff --git a/phonelibs/libyuv/lib/libyuv.a b/third_party/libyuv/lib/libyuv.a
similarity index 100%
rename from phonelibs/libyuv/lib/libyuv.a
rename to third_party/libyuv/lib/libyuv.a
diff --git a/phonelibs/libyuv/mac/lib/libyuv.a b/third_party/libyuv/mac/lib/libyuv.a
similarity index 100%
rename from phonelibs/libyuv/mac/lib/libyuv.a
rename to third_party/libyuv/mac/lib/libyuv.a
diff --git a/phonelibs/libyuv/mac_arm64/lib/libyuv.a b/third_party/libyuv/mac_arm64/lib/libyuv.a
similarity index 100%
rename from phonelibs/libyuv/mac_arm64/lib/libyuv.a
rename to third_party/libyuv/mac_arm64/lib/libyuv.a
diff --git a/phonelibs/libyuv/x64/include b/third_party/libyuv/x64/include
similarity index 100%
rename from phonelibs/libyuv/x64/include
rename to third_party/libyuv/x64/include
diff --git a/phonelibs/libyuv/x64/lib/libyuv.a b/third_party/libyuv/x64/lib/libyuv.a
similarity index 100%
rename from phonelibs/libyuv/x64/lib/libyuv.a
rename to third_party/libyuv/x64/lib/libyuv.a
diff --git a/phonelibs/linux/include/linux/ion.h b/third_party/linux/include/linux/ion.h
similarity index 100%
rename from phonelibs/linux/include/linux/ion.h
rename to third_party/linux/include/linux/ion.h
diff --git a/phonelibs/linux/include/msm_ion.h b/third_party/linux/include/msm_ion.h
similarity index 100%
rename from phonelibs/linux/include/msm_ion.h
rename to third_party/linux/include/msm_ion.h
diff --git a/phonelibs/mapbox-gl-native-qt/.gitattributes b/third_party/mapbox-gl-native-qt/.gitattributes
similarity index 100%
rename from phonelibs/mapbox-gl-native-qt/.gitattributes
rename to third_party/mapbox-gl-native-qt/.gitattributes
diff --git a/phonelibs/mapbox-gl-native-qt/build.sh b/third_party/mapbox-gl-native-qt/build.sh
similarity index 100%
rename from phonelibs/mapbox-gl-native-qt/build.sh
rename to third_party/mapbox-gl-native-qt/build.sh
diff --git a/phonelibs/mapbox-gl-native-qt/include/QMapbox b/third_party/mapbox-gl-native-qt/include/QMapbox
similarity index 100%
rename from phonelibs/mapbox-gl-native-qt/include/QMapbox
rename to third_party/mapbox-gl-native-qt/include/QMapbox
diff --git a/phonelibs/mapbox-gl-native-qt/include/QMapboxGL b/third_party/mapbox-gl-native-qt/include/QMapboxGL
similarity index 100%
rename from phonelibs/mapbox-gl-native-qt/include/QMapboxGL
rename to third_party/mapbox-gl-native-qt/include/QMapboxGL
diff --git a/phonelibs/mapbox-gl-native-qt/include/qmapbox.hpp b/third_party/mapbox-gl-native-qt/include/qmapbox.hpp
similarity index 100%
rename from phonelibs/mapbox-gl-native-qt/include/qmapbox.hpp
rename to third_party/mapbox-gl-native-qt/include/qmapbox.hpp
diff --git a/phonelibs/mapbox-gl-native-qt/include/qmapboxgl.hpp b/third_party/mapbox-gl-native-qt/include/qmapboxgl.hpp
similarity index 100%
rename from phonelibs/mapbox-gl-native-qt/include/qmapboxgl.hpp
rename to third_party/mapbox-gl-native-qt/include/qmapboxgl.hpp
diff --git a/phonelibs/mapbox-gl-native-qt/x86_64/libqmapboxgl.so b/third_party/mapbox-gl-native-qt/x86_64/libqmapboxgl.so
similarity index 100%
rename from phonelibs/mapbox-gl-native-qt/x86_64/libqmapboxgl.so
rename to third_party/mapbox-gl-native-qt/x86_64/libqmapboxgl.so
diff --git a/phonelibs/nanovg/fontstash.h b/third_party/nanovg/fontstash.h
similarity index 100%
rename from phonelibs/nanovg/fontstash.h
rename to third_party/nanovg/fontstash.h
diff --git a/phonelibs/nanovg/nanovg.c b/third_party/nanovg/nanovg.c
similarity index 100%
rename from phonelibs/nanovg/nanovg.c
rename to third_party/nanovg/nanovg.c
diff --git a/phonelibs/nanovg/nanovg.h b/third_party/nanovg/nanovg.h
similarity index 100%
rename from phonelibs/nanovg/nanovg.h
rename to third_party/nanovg/nanovg.h
diff --git a/phonelibs/nanovg/nanovg_gl.h b/third_party/nanovg/nanovg_gl.h
similarity index 100%
rename from phonelibs/nanovg/nanovg_gl.h
rename to third_party/nanovg/nanovg_gl.h
diff --git a/phonelibs/nanovg/nanovg_gl_utils.h b/third_party/nanovg/nanovg_gl_utils.h
similarity index 100%
rename from phonelibs/nanovg/nanovg_gl_utils.h
rename to third_party/nanovg/nanovg_gl_utils.h
diff --git a/phonelibs/nanovg/stb_image.h b/third_party/nanovg/stb_image.h
similarity index 100%
rename from phonelibs/nanovg/stb_image.h
rename to third_party/nanovg/stb_image.h
diff --git a/phonelibs/nanovg/stb_truetype.h b/third_party/nanovg/stb_truetype.h
similarity index 100%
rename from phonelibs/nanovg/stb_truetype.h
rename to third_party/nanovg/stb_truetype.h
diff --git a/phonelibs/opencl/include/CL/cl.h b/third_party/opencl/include/CL/cl.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl.h
rename to third_party/opencl/include/CL/cl.h
diff --git a/phonelibs/opencl/include/CL/cl_d3d10.h b/third_party/opencl/include/CL/cl_d3d10.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_d3d10.h
rename to third_party/opencl/include/CL/cl_d3d10.h
diff --git a/phonelibs/opencl/include/CL/cl_d3d11.h b/third_party/opencl/include/CL/cl_d3d11.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_d3d11.h
rename to third_party/opencl/include/CL/cl_d3d11.h
diff --git a/phonelibs/opencl/include/CL/cl_dx9_media_sharing.h b/third_party/opencl/include/CL/cl_dx9_media_sharing.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_dx9_media_sharing.h
rename to third_party/opencl/include/CL/cl_dx9_media_sharing.h
diff --git a/phonelibs/opencl/include/CL/cl_egl.h b/third_party/opencl/include/CL/cl_egl.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_egl.h
rename to third_party/opencl/include/CL/cl_egl.h
diff --git a/phonelibs/opencl/include/CL/cl_ext.h b/third_party/opencl/include/CL/cl_ext.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_ext.h
rename to third_party/opencl/include/CL/cl_ext.h
diff --git a/phonelibs/opencl/include/CL/cl_ext_qcom.h b/third_party/opencl/include/CL/cl_ext_qcom.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_ext_qcom.h
rename to third_party/opencl/include/CL/cl_ext_qcom.h
diff --git a/phonelibs/opencl/include/CL/cl_gl.h b/third_party/opencl/include/CL/cl_gl.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_gl.h
rename to third_party/opencl/include/CL/cl_gl.h
diff --git a/phonelibs/opencl/include/CL/cl_gl_ext.h b/third_party/opencl/include/CL/cl_gl_ext.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_gl_ext.h
rename to third_party/opencl/include/CL/cl_gl_ext.h
diff --git a/phonelibs/opencl/include/CL/cl_platform.h b/third_party/opencl/include/CL/cl_platform.h
similarity index 100%
rename from phonelibs/opencl/include/CL/cl_platform.h
rename to third_party/opencl/include/CL/cl_platform.h
diff --git a/phonelibs/opencl/include/CL/opencl.h b/third_party/opencl/include/CL/opencl.h
similarity index 100%
rename from phonelibs/opencl/include/CL/opencl.h
rename to third_party/opencl/include/CL/opencl.h
diff --git a/phonelibs/openmax/include/OMX_Audio.h b/third_party/openmax/include/OMX_Audio.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Audio.h
rename to third_party/openmax/include/OMX_Audio.h
diff --git a/phonelibs/openmax/include/OMX_Component.h b/third_party/openmax/include/OMX_Component.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Component.h
rename to third_party/openmax/include/OMX_Component.h
diff --git a/phonelibs/openmax/include/OMX_ContentPipe.h b/third_party/openmax/include/OMX_ContentPipe.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_ContentPipe.h
rename to third_party/openmax/include/OMX_ContentPipe.h
diff --git a/phonelibs/openmax/include/OMX_Core.h b/third_party/openmax/include/OMX_Core.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Core.h
rename to third_party/openmax/include/OMX_Core.h
diff --git a/phonelibs/openmax/include/OMX_CoreExt.h b/third_party/openmax/include/OMX_CoreExt.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_CoreExt.h
rename to third_party/openmax/include/OMX_CoreExt.h
diff --git a/phonelibs/openmax/include/OMX_IVCommon.h b/third_party/openmax/include/OMX_IVCommon.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_IVCommon.h
rename to third_party/openmax/include/OMX_IVCommon.h
diff --git a/phonelibs/openmax/include/OMX_Image.h b/third_party/openmax/include/OMX_Image.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Image.h
rename to third_party/openmax/include/OMX_Image.h
diff --git a/phonelibs/openmax/include/OMX_Index.h b/third_party/openmax/include/OMX_Index.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Index.h
rename to third_party/openmax/include/OMX_Index.h
diff --git a/phonelibs/openmax/include/OMX_IndexExt.h b/third_party/openmax/include/OMX_IndexExt.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_IndexExt.h
rename to third_party/openmax/include/OMX_IndexExt.h
diff --git a/phonelibs/openmax/include/OMX_Other.h b/third_party/openmax/include/OMX_Other.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Other.h
rename to third_party/openmax/include/OMX_Other.h
diff --git a/phonelibs/openmax/include/OMX_QCOMExtns.h b/third_party/openmax/include/OMX_QCOMExtns.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_QCOMExtns.h
rename to third_party/openmax/include/OMX_QCOMExtns.h
diff --git a/phonelibs/openmax/include/OMX_Skype_VideoExtensions.h b/third_party/openmax/include/OMX_Skype_VideoExtensions.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Skype_VideoExtensions.h
rename to third_party/openmax/include/OMX_Skype_VideoExtensions.h
diff --git a/phonelibs/openmax/include/OMX_Types.h b/third_party/openmax/include/OMX_Types.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Types.h
rename to third_party/openmax/include/OMX_Types.h
diff --git a/phonelibs/openmax/include/OMX_Video.h b/third_party/openmax/include/OMX_Video.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_Video.h
rename to third_party/openmax/include/OMX_Video.h
diff --git a/phonelibs/openmax/include/OMX_VideoExt.h b/third_party/openmax/include/OMX_VideoExt.h
similarity index 100%
rename from phonelibs/openmax/include/OMX_VideoExt.h
rename to third_party/openmax/include/OMX_VideoExt.h
diff --git a/phonelibs/qrcode/QrCode.cc b/third_party/qrcode/QrCode.cc
similarity index 100%
rename from phonelibs/qrcode/QrCode.cc
rename to third_party/qrcode/QrCode.cc
diff --git a/phonelibs/qrcode/QrCode.hpp b/third_party/qrcode/QrCode.hpp
similarity index 100%
rename from phonelibs/qrcode/QrCode.hpp
rename to third_party/qrcode/QrCode.hpp
diff --git a/phonelibs/qt-plugins/build_qtlocation.sh b/third_party/qt-plugins/build_qtlocation.sh
similarity index 100%
rename from phonelibs/qt-plugins/build_qtlocation.sh
rename to third_party/qt-plugins/build_qtlocation.sh
diff --git a/phonelibs/qt-plugins/x86_64/geoservices/.gitattributes b/third_party/qt-plugins/x86_64/geoservices/.gitattributes
similarity index 100%
rename from phonelibs/qt-plugins/x86_64/geoservices/.gitattributes
rename to third_party/qt-plugins/x86_64/geoservices/.gitattributes
diff --git a/phonelibs/qt-plugins/x86_64/geoservices/libqtgeoservices_mapbox.so b/third_party/qt-plugins/x86_64/geoservices/libqtgeoservices_mapbox.so
similarity index 100%
rename from phonelibs/qt-plugins/x86_64/geoservices/libqtgeoservices_mapbox.so
rename to third_party/qt-plugins/x86_64/geoservices/libqtgeoservices_mapbox.so
diff --git a/phonelibs/snpe/aarch64 b/third_party/snpe/aarch64
similarity index 100%
rename from phonelibs/snpe/aarch64
rename to third_party/snpe/aarch64
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libPlatformValidatorShared.so b/third_party/snpe/aarch64-android-clang6.0/libPlatformValidatorShared.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libPlatformValidatorShared.so
rename to third_party/snpe/aarch64-android-clang6.0/libPlatformValidatorShared.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libSNPE.so b/third_party/snpe/aarch64-android-clang6.0/libSNPE.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libSNPE.so
rename to third_party/snpe/aarch64-android-clang6.0/libSNPE.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libSNPE_G.so b/third_party/snpe/aarch64-android-clang6.0/libSNPE_G.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libSNPE_G.so
rename to third_party/snpe/aarch64-android-clang6.0/libSNPE_G.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libc++_shared.so b/third_party/snpe/aarch64-android-clang6.0/libc++_shared.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libc++_shared.so
rename to third_party/snpe/aarch64-android-clang6.0/libc++_shared.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libcalculator.so b/third_party/snpe/aarch64-android-clang6.0/libcalculator.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libcalculator.so
rename to third_party/snpe/aarch64-android-clang6.0/libcalculator.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libcalculator_domains.so b/third_party/snpe/aarch64-android-clang6.0/libcalculator_domains.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libcalculator_domains.so
rename to third_party/snpe/aarch64-android-clang6.0/libcalculator_domains.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libhta.so b/third_party/snpe/aarch64-android-clang6.0/libhta.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libhta.so
rename to third_party/snpe/aarch64-android-clang6.0/libhta.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libsnpe_adsp.so b/third_party/snpe/aarch64-android-clang6.0/libsnpe_adsp.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libsnpe_adsp.so
rename to third_party/snpe/aarch64-android-clang6.0/libsnpe_adsp.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains.so b/third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains.so
rename to third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_system.so b/third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_system.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_system.so
rename to third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_system.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2.so b/third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2.so
rename to third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2_system.so b/third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2_system.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2_system.so
rename to third_party/snpe/aarch64-android-clang6.0/libsnpe_dsp_domains_v2_system.so
diff --git a/phonelibs/snpe/aarch64-android-clang6.0/libsymphony-cpu.so b/third_party/snpe/aarch64-android-clang6.0/libsymphony-cpu.so
similarity index 100%
rename from phonelibs/snpe/aarch64-android-clang6.0/libsymphony-cpu.so
rename to third_party/snpe/aarch64-android-clang6.0/libsymphony-cpu.so
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libPlatformValidatorShared.so b/third_party/snpe/aarch64-linux-gcc4.9/libPlatformValidatorShared.so
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libPlatformValidatorShared.so
rename to third_party/snpe/aarch64-linux-gcc4.9/libPlatformValidatorShared.so
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libSNPE.so b/third_party/snpe/aarch64-linux-gcc4.9/libSNPE.so
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libSNPE.so
rename to third_party/snpe/aarch64-linux-gcc4.9/libSNPE.so
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libatomic.so.1 b/third_party/snpe/aarch64-linux-gcc4.9/libatomic.so.1
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libatomic.so.1
rename to third_party/snpe/aarch64-linux-gcc4.9/libatomic.so.1
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libcalculator.so b/third_party/snpe/aarch64-linux-gcc4.9/libcalculator.so
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libcalculator.so
rename to third_party/snpe/aarch64-linux-gcc4.9/libcalculator.so
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libcalculator_domains.so b/third_party/snpe/aarch64-linux-gcc4.9/libcalculator_domains.so
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libcalculator_domains.so
rename to third_party/snpe/aarch64-linux-gcc4.9/libcalculator_domains.so
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libsnpe_adsp.so b/third_party/snpe/aarch64-linux-gcc4.9/libsnpe_adsp.so
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libsnpe_adsp.so
rename to third_party/snpe/aarch64-linux-gcc4.9/libsnpe_adsp.so
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libsnpe_dsp_domains_v2.so b/third_party/snpe/aarch64-linux-gcc4.9/libsnpe_dsp_domains_v2.so
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libsnpe_dsp_domains_v2.so
rename to third_party/snpe/aarch64-linux-gcc4.9/libsnpe_dsp_domains_v2.so
diff --git a/phonelibs/snpe/aarch64-linux-gcc4.9/libsymphony-cpu.so b/third_party/snpe/aarch64-linux-gcc4.9/libsymphony-cpu.so
similarity index 100%
rename from phonelibs/snpe/aarch64-linux-gcc4.9/libsymphony-cpu.so
rename to third_party/snpe/aarch64-linux-gcc4.9/libsymphony-cpu.so
diff --git a/phonelibs/snpe/dsp/libcalculator_domains_skel.so b/third_party/snpe/dsp/libcalculator_domains_skel.so
similarity index 100%
rename from phonelibs/snpe/dsp/libcalculator_domains_skel.so
rename to third_party/snpe/dsp/libcalculator_domains_skel.so
diff --git a/phonelibs/snpe/dsp/libcalculator_skel.so b/third_party/snpe/dsp/libcalculator_skel.so
similarity index 100%
rename from phonelibs/snpe/dsp/libcalculator_skel.so
rename to third_party/snpe/dsp/libcalculator_skel.so
diff --git a/phonelibs/snpe/dsp/libsnpe_dsp_domains_skel.so b/third_party/snpe/dsp/libsnpe_dsp_domains_skel.so
similarity index 100%
rename from phonelibs/snpe/dsp/libsnpe_dsp_domains_skel.so
rename to third_party/snpe/dsp/libsnpe_dsp_domains_skel.so
diff --git a/phonelibs/snpe/dsp/libsnpe_dsp_skel.so b/third_party/snpe/dsp/libsnpe_dsp_skel.so
similarity index 100%
rename from phonelibs/snpe/dsp/libsnpe_dsp_skel.so
rename to third_party/snpe/dsp/libsnpe_dsp_skel.so
diff --git a/phonelibs/snpe/dsp/libsnpe_dsp_v65_domains_v2_skel.so b/third_party/snpe/dsp/libsnpe_dsp_v65_domains_v2_skel.so
similarity index 100%
rename from phonelibs/snpe/dsp/libsnpe_dsp_v65_domains_v2_skel.so
rename to third_party/snpe/dsp/libsnpe_dsp_v65_domains_v2_skel.so
diff --git a/phonelibs/snpe/dsp/libsnpe_dsp_v66_domains_v2_skel.so b/third_party/snpe/dsp/libsnpe_dsp_v66_domains_v2_skel.so
similarity index 100%
rename from phonelibs/snpe/dsp/libsnpe_dsp_v66_domains_v2_skel.so
rename to third_party/snpe/dsp/libsnpe_dsp_v66_domains_v2_skel.so
diff --git a/phonelibs/snpe/include/DiagLog/IDiagLog.hpp b/third_party/snpe/include/DiagLog/IDiagLog.hpp
similarity index 100%
rename from phonelibs/snpe/include/DiagLog/IDiagLog.hpp
rename to third_party/snpe/include/DiagLog/IDiagLog.hpp
diff --git a/phonelibs/snpe/include/DiagLog/Options.hpp b/third_party/snpe/include/DiagLog/Options.hpp
similarity index 100%
rename from phonelibs/snpe/include/DiagLog/Options.hpp
rename to third_party/snpe/include/DiagLog/Options.hpp
diff --git a/phonelibs/snpe/include/DlContainer/IDlContainer.hpp b/third_party/snpe/include/DlContainer/IDlContainer.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlContainer/IDlContainer.hpp
rename to third_party/snpe/include/DlContainer/IDlContainer.hpp
diff --git a/phonelibs/snpe/include/DlSystem/DlEnums.hpp b/third_party/snpe/include/DlSystem/DlEnums.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/DlEnums.hpp
rename to third_party/snpe/include/DlSystem/DlEnums.hpp
diff --git a/phonelibs/snpe/include/DlSystem/DlError.hpp b/third_party/snpe/include/DlSystem/DlError.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/DlError.hpp
rename to third_party/snpe/include/DlSystem/DlError.hpp
diff --git a/phonelibs/snpe/include/DlSystem/DlOptional.hpp b/third_party/snpe/include/DlSystem/DlOptional.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/DlOptional.hpp
rename to third_party/snpe/include/DlSystem/DlOptional.hpp
diff --git a/phonelibs/snpe/include/DlSystem/DlVersion.hpp b/third_party/snpe/include/DlSystem/DlVersion.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/DlVersion.hpp
rename to third_party/snpe/include/DlSystem/DlVersion.hpp
diff --git a/phonelibs/snpe/include/DlSystem/IBufferAttributes.hpp b/third_party/snpe/include/DlSystem/IBufferAttributes.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/IBufferAttributes.hpp
rename to third_party/snpe/include/DlSystem/IBufferAttributes.hpp
diff --git a/phonelibs/snpe/include/DlSystem/ITensor.hpp b/third_party/snpe/include/DlSystem/ITensor.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/ITensor.hpp
rename to third_party/snpe/include/DlSystem/ITensor.hpp
diff --git a/phonelibs/snpe/include/DlSystem/ITensorFactory.hpp b/third_party/snpe/include/DlSystem/ITensorFactory.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/ITensorFactory.hpp
rename to third_party/snpe/include/DlSystem/ITensorFactory.hpp
diff --git a/phonelibs/snpe/include/DlSystem/ITensorItr.hpp b/third_party/snpe/include/DlSystem/ITensorItr.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/ITensorItr.hpp
rename to third_party/snpe/include/DlSystem/ITensorItr.hpp
diff --git a/phonelibs/snpe/include/DlSystem/ITensorItrImpl.hpp b/third_party/snpe/include/DlSystem/ITensorItrImpl.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/ITensorItrImpl.hpp
rename to third_party/snpe/include/DlSystem/ITensorItrImpl.hpp
diff --git a/phonelibs/snpe/include/DlSystem/IUDL.hpp b/third_party/snpe/include/DlSystem/IUDL.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/IUDL.hpp
rename to third_party/snpe/include/DlSystem/IUDL.hpp
diff --git a/phonelibs/snpe/include/DlSystem/IUserBuffer.hpp b/third_party/snpe/include/DlSystem/IUserBuffer.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/IUserBuffer.hpp
rename to third_party/snpe/include/DlSystem/IUserBuffer.hpp
diff --git a/phonelibs/snpe/include/DlSystem/IUserBufferFactory.hpp b/third_party/snpe/include/DlSystem/IUserBufferFactory.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/IUserBufferFactory.hpp
rename to third_party/snpe/include/DlSystem/IUserBufferFactory.hpp
diff --git a/phonelibs/snpe/include/DlSystem/PlatformConfig.hpp b/third_party/snpe/include/DlSystem/PlatformConfig.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/PlatformConfig.hpp
rename to third_party/snpe/include/DlSystem/PlatformConfig.hpp
diff --git a/phonelibs/snpe/include/DlSystem/RuntimeList.hpp b/third_party/snpe/include/DlSystem/RuntimeList.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/RuntimeList.hpp
rename to third_party/snpe/include/DlSystem/RuntimeList.hpp
diff --git a/phonelibs/snpe/include/DlSystem/String.hpp b/third_party/snpe/include/DlSystem/String.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/String.hpp
rename to third_party/snpe/include/DlSystem/String.hpp
diff --git a/phonelibs/snpe/include/DlSystem/StringList.hpp b/third_party/snpe/include/DlSystem/StringList.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/StringList.hpp
rename to third_party/snpe/include/DlSystem/StringList.hpp
diff --git a/phonelibs/snpe/include/DlSystem/TensorMap.hpp b/third_party/snpe/include/DlSystem/TensorMap.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/TensorMap.hpp
rename to third_party/snpe/include/DlSystem/TensorMap.hpp
diff --git a/phonelibs/snpe/include/DlSystem/TensorShape.hpp b/third_party/snpe/include/DlSystem/TensorShape.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/TensorShape.hpp
rename to third_party/snpe/include/DlSystem/TensorShape.hpp
diff --git a/phonelibs/snpe/include/DlSystem/TensorShapeMap.hpp b/third_party/snpe/include/DlSystem/TensorShapeMap.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/TensorShapeMap.hpp
rename to third_party/snpe/include/DlSystem/TensorShapeMap.hpp
diff --git a/phonelibs/snpe/include/DlSystem/UDLContext.hpp b/third_party/snpe/include/DlSystem/UDLContext.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/UDLContext.hpp
rename to third_party/snpe/include/DlSystem/UDLContext.hpp
diff --git a/phonelibs/snpe/include/DlSystem/UDLFunc.hpp b/third_party/snpe/include/DlSystem/UDLFunc.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/UDLFunc.hpp
rename to third_party/snpe/include/DlSystem/UDLFunc.hpp
diff --git a/phonelibs/snpe/include/DlSystem/UserBufferMap.hpp b/third_party/snpe/include/DlSystem/UserBufferMap.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/UserBufferMap.hpp
rename to third_party/snpe/include/DlSystem/UserBufferMap.hpp
diff --git a/phonelibs/snpe/include/DlSystem/ZdlExportDefine.hpp b/third_party/snpe/include/DlSystem/ZdlExportDefine.hpp
similarity index 100%
rename from phonelibs/snpe/include/DlSystem/ZdlExportDefine.hpp
rename to third_party/snpe/include/DlSystem/ZdlExportDefine.hpp
diff --git a/phonelibs/snpe/include/PlatformValidator/PlatformValidator.hpp b/third_party/snpe/include/PlatformValidator/PlatformValidator.hpp
similarity index 100%
rename from phonelibs/snpe/include/PlatformValidator/PlatformValidator.hpp
rename to third_party/snpe/include/PlatformValidator/PlatformValidator.hpp
diff --git a/phonelibs/snpe/include/SNPE/ApplicationBufferMap.hpp b/third_party/snpe/include/SNPE/ApplicationBufferMap.hpp
similarity index 100%
rename from phonelibs/snpe/include/SNPE/ApplicationBufferMap.hpp
rename to third_party/snpe/include/SNPE/ApplicationBufferMap.hpp
diff --git a/phonelibs/snpe/include/SNPE/PSNPE.hpp b/third_party/snpe/include/SNPE/PSNPE.hpp
similarity index 100%
rename from phonelibs/snpe/include/SNPE/PSNPE.hpp
rename to third_party/snpe/include/SNPE/PSNPE.hpp
diff --git a/phonelibs/snpe/include/SNPE/RuntimeConfigList.hpp b/third_party/snpe/include/SNPE/RuntimeConfigList.hpp
similarity index 100%
rename from phonelibs/snpe/include/SNPE/RuntimeConfigList.hpp
rename to third_party/snpe/include/SNPE/RuntimeConfigList.hpp
diff --git a/phonelibs/snpe/include/SNPE/SNPE.hpp b/third_party/snpe/include/SNPE/SNPE.hpp
similarity index 100%
rename from phonelibs/snpe/include/SNPE/SNPE.hpp
rename to third_party/snpe/include/SNPE/SNPE.hpp
diff --git a/phonelibs/snpe/include/SNPE/SNPEBuilder.hpp b/third_party/snpe/include/SNPE/SNPEBuilder.hpp
similarity index 100%
rename from phonelibs/snpe/include/SNPE/SNPEBuilder.hpp
rename to third_party/snpe/include/SNPE/SNPEBuilder.hpp
diff --git a/phonelibs/snpe/include/SNPE/SNPEFactory.hpp b/third_party/snpe/include/SNPE/SNPEFactory.hpp
similarity index 100%
rename from phonelibs/snpe/include/SNPE/SNPEFactory.hpp
rename to third_party/snpe/include/SNPE/SNPEFactory.hpp
diff --git a/phonelibs/snpe/include/SNPE/UserBufferList.hpp b/third_party/snpe/include/SNPE/UserBufferList.hpp
similarity index 100%
rename from phonelibs/snpe/include/SNPE/UserBufferList.hpp
rename to third_party/snpe/include/SNPE/UserBufferList.hpp
diff --git a/phonelibs/snpe/include/SnpeUdo/UdoBase.h b/third_party/snpe/include/SnpeUdo/UdoBase.h
similarity index 100%
rename from phonelibs/snpe/include/SnpeUdo/UdoBase.h
rename to third_party/snpe/include/SnpeUdo/UdoBase.h
diff --git a/phonelibs/snpe/include/SnpeUdo/UdoImpl.h b/third_party/snpe/include/SnpeUdo/UdoImpl.h
similarity index 100%
rename from phonelibs/snpe/include/SnpeUdo/UdoImpl.h
rename to third_party/snpe/include/SnpeUdo/UdoImpl.h
diff --git a/phonelibs/snpe/include/SnpeUdo/UdoImplCpu.h b/third_party/snpe/include/SnpeUdo/UdoImplCpu.h
similarity index 100%
rename from phonelibs/snpe/include/SnpeUdo/UdoImplCpu.h
rename to third_party/snpe/include/SnpeUdo/UdoImplCpu.h
diff --git a/phonelibs/snpe/include/SnpeUdo/UdoImplDsp.h b/third_party/snpe/include/SnpeUdo/UdoImplDsp.h
similarity index 100%
rename from phonelibs/snpe/include/SnpeUdo/UdoImplDsp.h
rename to third_party/snpe/include/SnpeUdo/UdoImplDsp.h
diff --git a/phonelibs/snpe/include/SnpeUdo/UdoImplGpu.h b/third_party/snpe/include/SnpeUdo/UdoImplGpu.h
similarity index 100%
rename from phonelibs/snpe/include/SnpeUdo/UdoImplGpu.h
rename to third_party/snpe/include/SnpeUdo/UdoImplGpu.h
diff --git a/phonelibs/snpe/include/SnpeUdo/UdoReg.h b/third_party/snpe/include/SnpeUdo/UdoReg.h
similarity index 100%
rename from phonelibs/snpe/include/SnpeUdo/UdoReg.h
rename to third_party/snpe/include/SnpeUdo/UdoReg.h
diff --git a/phonelibs/snpe/include/SnpeUdo/UdoShared.h b/third_party/snpe/include/SnpeUdo/UdoShared.h
similarity index 100%
rename from phonelibs/snpe/include/SnpeUdo/UdoShared.h
rename to third_party/snpe/include/SnpeUdo/UdoShared.h
diff --git a/phonelibs/snpe/larch64 b/third_party/snpe/larch64
similarity index 100%
rename from phonelibs/snpe/larch64
rename to third_party/snpe/larch64
diff --git a/phonelibs/snpe/x86_64 b/third_party/snpe/x86_64
similarity index 100%
rename from phonelibs/snpe/x86_64
rename to third_party/snpe/x86_64
diff --git a/phonelibs/snpe/x86_64-linux-clang/libSNPE.so b/third_party/snpe/x86_64-linux-clang/libSNPE.so
similarity index 100%
rename from phonelibs/snpe/x86_64-linux-clang/libSNPE.so
rename to third_party/snpe/x86_64-linux-clang/libSNPE.so
diff --git a/phonelibs/snpe/x86_64-linux-clang/libomp.so b/third_party/snpe/x86_64-linux-clang/libomp.so
similarity index 100%
rename from phonelibs/snpe/x86_64-linux-clang/libomp.so
rename to third_party/snpe/x86_64-linux-clang/libomp.so
diff --git a/phonelibs/snpe/x86_64-linux-clang/libsymphony-cpu.so b/third_party/snpe/x86_64-linux-clang/libsymphony-cpu.so
similarity index 100%
rename from phonelibs/snpe/x86_64-linux-clang/libsymphony-cpu.so
rename to third_party/snpe/x86_64-linux-clang/libsymphony-cpu.so
diff --git a/phonelibs/zlib/build.txt b/third_party/zlib/build.txt
similarity index 100%
rename from phonelibs/zlib/build.txt
rename to third_party/zlib/build.txt
diff --git a/phonelibs/zlib/lib/libz.a b/third_party/zlib/lib/libz.a
similarity index 100%
rename from phonelibs/zlib/lib/libz.a
rename to third_party/zlib/lib/libz.a
diff --git a/tools/sim/Dockerfile.sim b/tools/sim/Dockerfile.sim
index 9afb4e4e1..06dfaef79 100644
--- a/tools/sim/Dockerfile.sim
+++ b/tools/sim/Dockerfile.sim
@@ -49,7 +49,7 @@ RUN mkdir -p $HOME/openpilot
 
 COPY SConstruct $HOME/openpilot/
 
-COPY ./phonelibs $HOME/openpilot/phonelibs
+COPY ./third_party $HOME/openpilot/third_party
 COPY ./pyextra $HOME/openpilot/pyextra
 COPY ./site_scons $HOME/openpilot/site_scons
 COPY ./rednose $HOME/openpilot/rednose