diff --git a/!zygote.sh b/src/!zygote.sh
similarity index 100%
rename from !zygote.sh
rename to src/!zygote.sh
diff --git a/gearlock/gearboot/boot-comp.sh b/src/gearlock/gearboot/boot-comp.sh
similarity index 100%
rename from gearlock/gearboot/boot-comp.sh
rename to src/gearlock/gearboot/boot-comp.sh
diff --git a/gearlock/gearboot/post-fs-data.sh b/src/gearlock/gearboot/post-fs-data.sh
similarity index 100%
rename from gearlock/gearboot/post-fs-data.sh
rename to src/gearlock/gearboot/post-fs-data.sh
diff --git a/install.sh b/src/install.sh
similarity index 100%
rename from install.sh
rename to src/install.sh
diff --git a/system/bin/arm/linker b/src/system/bin/arm/linker
similarity index 100%
rename from system/bin/arm/linker
rename to src/system/bin/arm/linker
diff --git a/system/bin/arm64/linker64 b/src/system/bin/arm64/linker64
similarity index 100%
rename from system/bin/arm64/linker64
rename to src/system/bin/arm64/linker64
diff --git a/system/bin/houdini b/src/system/bin/houdini
similarity index 100%
rename from system/bin/houdini
rename to src/system/bin/houdini
diff --git a/system/bin/houdini64 b/src/system/bin/houdini64
similarity index 100%
rename from system/bin/houdini64
rename to src/system/bin/houdini64
diff --git a/system/lib/arm/android.frameworks.bufferhub@1.0.so b/src/system/lib/arm/android.frameworks.bufferhub@1.0.so
similarity index 100%
rename from system/lib/arm/android.frameworks.bufferhub@1.0.so
rename to src/system/lib/arm/android.frameworks.bufferhub@1.0.so
diff --git a/system/lib/arm/android.frameworks.vr.composer@2.0.so b/src/system/lib/arm/android.frameworks.vr.composer@2.0.so
similarity index 100%
rename from system/lib/arm/android.frameworks.vr.composer@2.0.so
rename to src/system/lib/arm/android.frameworks.vr.composer@2.0.so
diff --git a/system/lib/arm/android.hardware.audio.common-util.so b/src/system/lib/arm/android.hardware.audio.common-util.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common-util.so
rename to src/system/lib/arm/android.hardware.audio.common-util.so
diff --git a/system/lib/arm/android.hardware.audio.common@2.0-util.so b/src/system/lib/arm/android.hardware.audio.common@2.0-util.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@2.0-util.so
rename to src/system/lib/arm/android.hardware.audio.common@2.0-util.so
diff --git a/system/lib/arm/android.hardware.audio.common@2.0.so b/src/system/lib/arm/android.hardware.audio.common@2.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@2.0.so
rename to src/system/lib/arm/android.hardware.audio.common@2.0.so
diff --git a/system/lib/arm/android.hardware.audio.common@4.0-util.so b/src/system/lib/arm/android.hardware.audio.common@4.0-util.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@4.0-util.so
rename to src/system/lib/arm/android.hardware.audio.common@4.0-util.so
diff --git a/system/lib/arm/android.hardware.audio.common@4.0.so b/src/system/lib/arm/android.hardware.audio.common@4.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@4.0.so
rename to src/system/lib/arm/android.hardware.audio.common@4.0.so
diff --git a/system/lib/arm/android.hardware.audio.common@5.0-util.so b/src/system/lib/arm/android.hardware.audio.common@5.0-util.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@5.0-util.so
rename to src/system/lib/arm/android.hardware.audio.common@5.0-util.so
diff --git a/system/lib/arm/android.hardware.audio.common@5.0.so b/src/system/lib/arm/android.hardware.audio.common@5.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@5.0.so
rename to src/system/lib/arm/android.hardware.audio.common@5.0.so
diff --git a/system/lib/arm/android.hardware.audio.common@6.0-util.so b/src/system/lib/arm/android.hardware.audio.common@6.0-util.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@6.0-util.so
rename to src/system/lib/arm/android.hardware.audio.common@6.0-util.so
diff --git a/system/lib/arm/android.hardware.audio.common@6.0.so b/src/system/lib/arm/android.hardware.audio.common@6.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.common@6.0.so
rename to src/system/lib/arm/android.hardware.audio.common@6.0.so
diff --git a/system/lib/arm/android.hardware.audio.effect@2.0.so b/src/system/lib/arm/android.hardware.audio.effect@2.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.effect@2.0.so
rename to src/system/lib/arm/android.hardware.audio.effect@2.0.so
diff --git a/system/lib/arm/android.hardware.audio.effect@4.0.so b/src/system/lib/arm/android.hardware.audio.effect@4.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.effect@4.0.so
rename to src/system/lib/arm/android.hardware.audio.effect@4.0.so
diff --git a/system/lib/arm/android.hardware.audio.effect@5.0.so b/src/system/lib/arm/android.hardware.audio.effect@5.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.effect@5.0.so
rename to src/system/lib/arm/android.hardware.audio.effect@5.0.so
diff --git a/system/lib/arm/android.hardware.audio.effect@6.0.so b/src/system/lib/arm/android.hardware.audio.effect@6.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio.effect@6.0.so
rename to src/system/lib/arm/android.hardware.audio.effect@6.0.so
diff --git a/system/lib/arm/android.hardware.audio@2.0.so b/src/system/lib/arm/android.hardware.audio@2.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio@2.0.so
rename to src/system/lib/arm/android.hardware.audio@2.0.so
diff --git a/system/lib/arm/android.hardware.audio@4.0.so b/src/system/lib/arm/android.hardware.audio@4.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio@4.0.so
rename to src/system/lib/arm/android.hardware.audio@4.0.so
diff --git a/system/lib/arm/android.hardware.audio@5.0.so b/src/system/lib/arm/android.hardware.audio@5.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio@5.0.so
rename to src/system/lib/arm/android.hardware.audio@5.0.so
diff --git a/system/lib/arm/android.hardware.audio@6.0.so b/src/system/lib/arm/android.hardware.audio@6.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.audio@6.0.so
rename to src/system/lib/arm/android.hardware.audio@6.0.so
diff --git a/system/lib/arm/android.hardware.cas.native@1.0.so b/src/system/lib/arm/android.hardware.cas.native@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.cas.native@1.0.so
rename to src/system/lib/arm/android.hardware.cas.native@1.0.so
diff --git a/system/lib/arm/android.hardware.cas@1.0.so b/src/system/lib/arm/android.hardware.cas@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.cas@1.0.so
rename to src/system/lib/arm/android.hardware.cas@1.0.so
diff --git a/system/lib/arm/android.hardware.common-V1-ndk_platform.so b/src/system/lib/arm/android.hardware.common-V1-ndk_platform.so
similarity index 100%
rename from system/lib/arm/android.hardware.common-V1-ndk_platform.so
rename to src/system/lib/arm/android.hardware.common-V1-ndk_platform.so
diff --git a/system/lib/arm/android.hardware.configstore-utils.so b/src/system/lib/arm/android.hardware.configstore-utils.so
similarity index 100%
rename from system/lib/arm/android.hardware.configstore-utils.so
rename to src/system/lib/arm/android.hardware.configstore-utils.so
diff --git a/system/lib/arm/android.hardware.configstore@1.0.so b/src/system/lib/arm/android.hardware.configstore@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.configstore@1.0.so
rename to src/system/lib/arm/android.hardware.configstore@1.0.so
diff --git a/system/lib/arm/android.hardware.configstore@1.1.so b/src/system/lib/arm/android.hardware.configstore@1.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.configstore@1.1.so
rename to src/system/lib/arm/android.hardware.configstore@1.1.so
diff --git a/system/lib/arm/android.hardware.drm@1.0.so b/src/system/lib/arm/android.hardware.drm@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.drm@1.0.so
rename to src/system/lib/arm/android.hardware.drm@1.0.so
diff --git a/system/lib/arm/android.hardware.drm@1.1.so b/src/system/lib/arm/android.hardware.drm@1.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.drm@1.1.so
rename to src/system/lib/arm/android.hardware.drm@1.1.so
diff --git a/system/lib/arm/android.hardware.drm@1.2.so b/src/system/lib/arm/android.hardware.drm@1.2.so
similarity index 100%
rename from system/lib/arm/android.hardware.drm@1.2.so
rename to src/system/lib/arm/android.hardware.drm@1.2.so
diff --git a/system/lib/arm/android.hardware.drm@1.3.so b/src/system/lib/arm/android.hardware.drm@1.3.so
similarity index 100%
rename from system/lib/arm/android.hardware.drm@1.3.so
rename to src/system/lib/arm/android.hardware.drm@1.3.so
diff --git a/system/lib/arm/android.hardware.graphics.allocator@2.0.so b/src/system/lib/arm/android.hardware.graphics.allocator@2.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.allocator@2.0.so
rename to src/system/lib/arm/android.hardware.graphics.allocator@2.0.so
diff --git a/system/lib/arm/android.hardware.graphics.allocator@3.0.so b/src/system/lib/arm/android.hardware.graphics.allocator@3.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.allocator@3.0.so
rename to src/system/lib/arm/android.hardware.graphics.allocator@3.0.so
diff --git a/system/lib/arm/android.hardware.graphics.allocator@4.0.so b/src/system/lib/arm/android.hardware.graphics.allocator@4.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.allocator@4.0.so
rename to src/system/lib/arm/android.hardware.graphics.allocator@4.0.so
diff --git a/system/lib/arm/android.hardware.graphics.bufferqueue@1.0.so b/src/system/lib/arm/android.hardware.graphics.bufferqueue@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.bufferqueue@1.0.so
rename to src/system/lib/arm/android.hardware.graphics.bufferqueue@1.0.so
diff --git a/system/lib/arm/android.hardware.graphics.bufferqueue@2.0.so b/src/system/lib/arm/android.hardware.graphics.bufferqueue@2.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.bufferqueue@2.0.so
rename to src/system/lib/arm/android.hardware.graphics.bufferqueue@2.0.so
diff --git a/system/lib/arm/android.hardware.graphics.common-V1-ndk_platform.so b/src/system/lib/arm/android.hardware.graphics.common-V1-ndk_platform.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.common-V1-ndk_platform.so
rename to src/system/lib/arm/android.hardware.graphics.common-V1-ndk_platform.so
diff --git a/system/lib/arm/android.hardware.graphics.common@1.0.so b/src/system/lib/arm/android.hardware.graphics.common@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.common@1.0.so
rename to src/system/lib/arm/android.hardware.graphics.common@1.0.so
diff --git a/system/lib/arm/android.hardware.graphics.common@1.1.so b/src/system/lib/arm/android.hardware.graphics.common@1.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.common@1.1.so
rename to src/system/lib/arm/android.hardware.graphics.common@1.1.so
diff --git a/system/lib/arm/android.hardware.graphics.common@1.2.so b/src/system/lib/arm/android.hardware.graphics.common@1.2.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.common@1.2.so
rename to src/system/lib/arm/android.hardware.graphics.common@1.2.so
diff --git a/system/lib/arm/android.hardware.graphics.composer@2.1.so b/src/system/lib/arm/android.hardware.graphics.composer@2.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.composer@2.1.so
rename to src/system/lib/arm/android.hardware.graphics.composer@2.1.so
diff --git a/system/lib/arm/android.hardware.graphics.composer@2.2.so b/src/system/lib/arm/android.hardware.graphics.composer@2.2.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.composer@2.2.so
rename to src/system/lib/arm/android.hardware.graphics.composer@2.2.so
diff --git a/system/lib/arm/android.hardware.graphics.composer@2.3.so b/src/system/lib/arm/android.hardware.graphics.composer@2.3.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.composer@2.3.so
rename to src/system/lib/arm/android.hardware.graphics.composer@2.3.so
diff --git a/system/lib/arm/android.hardware.graphics.composer@2.4.so b/src/system/lib/arm/android.hardware.graphics.composer@2.4.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.composer@2.4.so
rename to src/system/lib/arm/android.hardware.graphics.composer@2.4.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@2.0-impl-2.1.so b/src/system/lib/arm/android.hardware.graphics.mapper@2.0-impl-2.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@2.0-impl-2.1.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@2.0-impl-2.1.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@2.0-impl.so b/src/system/lib/arm/android.hardware.graphics.mapper@2.0-impl.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@2.0-impl.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@2.0-impl.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@2.0.so b/src/system/lib/arm/android.hardware.graphics.mapper@2.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@2.0.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@2.0.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@2.1.so b/src/system/lib/arm/android.hardware.graphics.mapper@2.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@2.1.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@2.1.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@3.0-impl-ranchu.so b/src/system/lib/arm/android.hardware.graphics.mapper@3.0-impl-ranchu.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@3.0-impl-ranchu.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@3.0-impl-ranchu.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@3.0.so b/src/system/lib/arm/android.hardware.graphics.mapper@3.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@3.0.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@3.0.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so b/src/system/lib/arm/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so
diff --git a/system/lib/arm/android.hardware.graphics.mapper@4.0.so b/src/system/lib/arm/android.hardware.graphics.mapper@4.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.graphics.mapper@4.0.so
rename to src/system/lib/arm/android.hardware.graphics.mapper@4.0.so
diff --git a/system/lib/arm/android.hardware.media.bufferpool@2.0.so b/src/system/lib/arm/android.hardware.media.bufferpool@2.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.media.bufferpool@2.0.so
rename to src/system/lib/arm/android.hardware.media.bufferpool@2.0.so
diff --git a/system/lib/arm/android.hardware.media.c2@1.0.so b/src/system/lib/arm/android.hardware.media.c2@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.media.c2@1.0.so
rename to src/system/lib/arm/android.hardware.media.c2@1.0.so
diff --git a/system/lib/arm/android.hardware.media.c2@1.1.so b/src/system/lib/arm/android.hardware.media.c2@1.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.media.c2@1.1.so
rename to src/system/lib/arm/android.hardware.media.c2@1.1.so
diff --git a/system/lib/arm/android.hardware.media.omx@1.0.so b/src/system/lib/arm/android.hardware.media.omx@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.media.omx@1.0.so
rename to src/system/lib/arm/android.hardware.media.omx@1.0.so
diff --git a/system/lib/arm/android.hardware.media@1.0.so b/src/system/lib/arm/android.hardware.media@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.media@1.0.so
rename to src/system/lib/arm/android.hardware.media@1.0.so
diff --git a/system/lib/arm/android.hardware.memtrack@1.0.so b/src/system/lib/arm/android.hardware.memtrack@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.memtrack@1.0.so
rename to src/system/lib/arm/android.hardware.memtrack@1.0.so
diff --git a/system/lib/arm/android.hardware.power-V1-cpp.so b/src/system/lib/arm/android.hardware.power-V1-cpp.so
similarity index 100%
rename from system/lib/arm/android.hardware.power-V1-cpp.so
rename to src/system/lib/arm/android.hardware.power-V1-cpp.so
diff --git a/system/lib/arm/android.hardware.power@1.0.so b/src/system/lib/arm/android.hardware.power@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.power@1.0.so
rename to src/system/lib/arm/android.hardware.power@1.0.so
diff --git a/system/lib/arm/android.hardware.power@1.1.so b/src/system/lib/arm/android.hardware.power@1.1.so
similarity index 100%
rename from system/lib/arm/android.hardware.power@1.1.so
rename to src/system/lib/arm/android.hardware.power@1.1.so
diff --git a/system/lib/arm/android.hardware.power@1.2.so b/src/system/lib/arm/android.hardware.power@1.2.so
similarity index 100%
rename from system/lib/arm/android.hardware.power@1.2.so
rename to src/system/lib/arm/android.hardware.power@1.2.so
diff --git a/system/lib/arm/android.hardware.power@1.3.so b/src/system/lib/arm/android.hardware.power@1.3.so
similarity index 100%
rename from system/lib/arm/android.hardware.power@1.3.so
rename to src/system/lib/arm/android.hardware.power@1.3.so
diff --git a/system/lib/arm/android.hardware.renderscript@1.0.so b/src/system/lib/arm/android.hardware.renderscript@1.0.so
similarity index 100%
rename from system/lib/arm/android.hardware.renderscript@1.0.so
rename to src/system/lib/arm/android.hardware.renderscript@1.0.so
diff --git a/system/lib/arm/android.hidl.allocator@1.0.so b/src/system/lib/arm/android.hidl.allocator@1.0.so
similarity index 100%
rename from system/lib/arm/android.hidl.allocator@1.0.so
rename to src/system/lib/arm/android.hidl.allocator@1.0.so
diff --git a/system/lib/arm/android.hidl.memory.token@1.0.so b/src/system/lib/arm/android.hidl.memory.token@1.0.so
similarity index 100%
rename from system/lib/arm/android.hidl.memory.token@1.0.so
rename to src/system/lib/arm/android.hidl.memory.token@1.0.so
diff --git a/system/lib/arm/android.hidl.memory@1.0-impl.so b/src/system/lib/arm/android.hidl.memory@1.0-impl.so
similarity index 100%
rename from system/lib/arm/android.hidl.memory@1.0-impl.so
rename to src/system/lib/arm/android.hidl.memory@1.0-impl.so
diff --git a/system/lib/arm/android.hidl.memory@1.0.so b/src/system/lib/arm/android.hidl.memory@1.0.so
similarity index 100%
rename from system/lib/arm/android.hidl.memory@1.0.so
rename to src/system/lib/arm/android.hidl.memory@1.0.so
diff --git a/system/lib/arm/android.hidl.safe_union@1.0.so b/src/system/lib/arm/android.hidl.safe_union@1.0.so
similarity index 100%
rename from system/lib/arm/android.hidl.safe_union@1.0.so
rename to src/system/lib/arm/android.hidl.safe_union@1.0.so
diff --git a/system/lib/arm/android.hidl.token@1.0-utils.so b/src/system/lib/arm/android.hidl.token@1.0-utils.so
similarity index 100%
rename from system/lib/arm/android.hidl.token@1.0-utils.so
rename to src/system/lib/arm/android.hidl.token@1.0-utils.so
diff --git a/system/lib/arm/android.hidl.token@1.0.so b/src/system/lib/arm/android.hidl.token@1.0.so
similarity index 100%
rename from system/lib/arm/android.hidl.token@1.0.so
rename to src/system/lib/arm/android.hidl.token@1.0.so
diff --git a/system/lib/arm/android.system.suspend@1.0.so b/src/system/lib/arm/android.system.suspend@1.0.so
similarity index 100%
rename from system/lib/arm/android.system.suspend@1.0.so
rename to src/system/lib/arm/android.system.suspend@1.0.so
diff --git a/system/lib/arm/capture_state_listener-aidl-V1-cpp.so b/src/system/lib/arm/capture_state_listener-aidl-V1-cpp.so
similarity index 100%
rename from system/lib/arm/capture_state_listener-aidl-V1-cpp.so
rename to src/system/lib/arm/capture_state_listener-aidl-V1-cpp.so
diff --git a/system/lib/arm/cpuinfo b/src/system/lib/arm/cpuinfo
similarity index 100%
rename from system/lib/arm/cpuinfo
rename to src/system/lib/arm/cpuinfo
diff --git a/system/lib/arm/cpuinfo.pure32 b/src/system/lib/arm/cpuinfo.pure32
similarity index 100%
rename from system/lib/arm/cpuinfo.pure32
rename to src/system/lib/arm/cpuinfo.pure32
diff --git a/system/lib/arm/gralloc.minigbm.so b/src/system/lib/arm/gralloc.minigbm.so
similarity index 100%
rename from system/lib/arm/gralloc.minigbm.so
rename to src/system/lib/arm/gralloc.minigbm.so
diff --git a/system/lib/arm/gralloc.ranchu.so b/src/system/lib/arm/gralloc.ranchu.so
similarity index 100%
rename from system/lib/arm/gralloc.ranchu.so
rename to src/system/lib/arm/gralloc.ranchu.so
diff --git a/system/lib/arm/ld-android.so b/src/system/lib/arm/ld-android.so
similarity index 100%
rename from system/lib/arm/ld-android.so
rename to src/system/lib/arm/ld-android.so
diff --git a/system/lib/arm/libEGL.so b/src/system/lib/arm/libEGL.so
similarity index 100%
rename from system/lib/arm/libEGL.so
rename to src/system/lib/arm/libEGL.so
diff --git a/system/lib/arm/libETC1.so b/src/system/lib/arm/libETC1.so
similarity index 100%
rename from system/lib/arm/libETC1.so
rename to src/system/lib/arm/libETC1.so
diff --git a/system/lib/arm/libGLESv1_CM.so b/src/system/lib/arm/libGLESv1_CM.so
similarity index 100%
rename from system/lib/arm/libGLESv1_CM.so
rename to src/system/lib/arm/libGLESv1_CM.so
diff --git a/system/lib/arm/libGLESv1_enc.so b/src/system/lib/arm/libGLESv1_enc.so
similarity index 100%
rename from system/lib/arm/libGLESv1_enc.so
rename to src/system/lib/arm/libGLESv1_enc.so
diff --git a/system/lib/arm/libGLESv2.so b/src/system/lib/arm/libGLESv2.so
similarity index 100%
rename from system/lib/arm/libGLESv2.so
rename to src/system/lib/arm/libGLESv2.so
diff --git a/system/lib/arm/libGLESv2_enc.so b/src/system/lib/arm/libGLESv2_enc.so
similarity index 100%
rename from system/lib/arm/libGLESv2_enc.so
rename to src/system/lib/arm/libGLESv2_enc.so
diff --git a/system/lib/arm/libGLESv3.so b/src/system/lib/arm/libGLESv3.so
similarity index 100%
rename from system/lib/arm/libGLESv3.so
rename to src/system/lib/arm/libGLESv3.so
diff --git a/system/lib/arm/libOpenMAXAL.so b/src/system/lib/arm/libOpenMAXAL.so
similarity index 100%
rename from system/lib/arm/libOpenMAXAL.so
rename to src/system/lib/arm/libOpenMAXAL.so
diff --git a/system/lib/arm/libOpenSLES.so b/src/system/lib/arm/libOpenSLES.so
similarity index 100%
rename from system/lib/arm/libOpenSLES.so
rename to src/system/lib/arm/libOpenSLES.so
diff --git a/system/lib/arm/libOpenglCodecCommon.so b/src/system/lib/arm/libOpenglCodecCommon.so
similarity index 100%
rename from system/lib/arm/libOpenglCodecCommon.so
rename to src/system/lib/arm/libOpenglCodecCommon.so
diff --git a/system/lib/arm/libOpenglSystemCommon.so b/src/system/lib/arm/libOpenglSystemCommon.so
similarity index 100%
rename from system/lib/arm/libOpenglSystemCommon.so
rename to src/system/lib/arm/libOpenglSystemCommon.so
diff --git a/system/lib/arm/libRS.so b/src/system/lib/arm/libRS.so
similarity index 100%
rename from system/lib/arm/libRS.so
rename to src/system/lib/arm/libRS.so
diff --git a/system/lib/arm/libRSCacheDir.so b/src/system/lib/arm/libRSCacheDir.so
similarity index 100%
rename from system/lib/arm/libRSCacheDir.so
rename to src/system/lib/arm/libRSCacheDir.so
diff --git a/system/lib/arm/libRSCpuRef.so b/src/system/lib/arm/libRSCpuRef.so
similarity index 100%
rename from system/lib/arm/libRSCpuRef.so
rename to src/system/lib/arm/libRSCpuRef.so
diff --git a/system/lib/arm/libRSDriver.so b/src/system/lib/arm/libRSDriver.so
similarity index 100%
rename from system/lib/arm/libRSDriver.so
rename to src/system/lib/arm/libRSDriver.so
diff --git a/system/lib/arm/libRS_internal.so b/src/system/lib/arm/libRS_internal.so
similarity index 100%
rename from system/lib/arm/libRS_internal.so
rename to src/system/lib/arm/libRS_internal.so
diff --git a/system/lib/arm/libRScpp.so b/src/system/lib/arm/libRScpp.so
similarity index 100%
rename from system/lib/arm/libRScpp.so
rename to src/system/lib/arm/libRScpp.so
diff --git a/system/lib/arm/libSurfaceFlingerProp.so b/src/system/lib/arm/libSurfaceFlingerProp.so
similarity index 100%
rename from system/lib/arm/libSurfaceFlingerProp.so
rename to src/system/lib/arm/libSurfaceFlingerProp.so
diff --git a/system/lib/arm/lib_renderControl_enc.so b/src/system/lib/arm/lib_renderControl_enc.so
similarity index 100%
rename from system/lib/arm/lib_renderControl_enc.so
rename to src/system/lib/arm/lib_renderControl_enc.so
diff --git a/system/lib/arm/libaaudio.so b/src/system/lib/arm/libaaudio.so
similarity index 100%
rename from system/lib/arm/libaaudio.so
rename to src/system/lib/arm/libaaudio.so
diff --git a/system/lib/arm/libaaudio_internal.so b/src/system/lib/arm/libaaudio_internal.so
similarity index 100%
rename from system/lib/arm/libaaudio_internal.so
rename to src/system/lib/arm/libaaudio_internal.so
diff --git a/system/lib/arm/libaeabi_map.so b/src/system/lib/arm/libaeabi_map.so
similarity index 100%
rename from system/lib/arm/libaeabi_map.so
rename to src/system/lib/arm/libaeabi_map.so
diff --git a/system/lib/arm/libamidi.so b/src/system/lib/arm/libamidi.so
similarity index 100%
rename from system/lib/arm/libamidi.so
rename to src/system/lib/arm/libamidi.so
diff --git a/system/lib/arm/libandroid.so b/src/system/lib/arm/libandroid.so
similarity index 100%
rename from system/lib/arm/libandroid.so
rename to src/system/lib/arm/libandroid.so
diff --git a/system/lib/arm/libandroid_net.so b/src/system/lib/arm/libandroid_net.so
similarity index 100%
rename from system/lib/arm/libandroid_net.so
rename to src/system/lib/arm/libandroid_net.so
diff --git a/system/lib/arm/libandroid_runtime.so b/src/system/lib/arm/libandroid_runtime.so
similarity index 100%
rename from system/lib/arm/libandroid_runtime.so
rename to src/system/lib/arm/libandroid_runtime.so
diff --git a/system/lib/arm/libandroid_runtime_lazy.so b/src/system/lib/arm/libandroid_runtime_lazy.so
similarity index 100%
rename from system/lib/arm/libandroid_runtime_lazy.so
rename to src/system/lib/arm/libandroid_runtime_lazy.so
diff --git a/system/lib/arm/libandroidemu.so b/src/system/lib/arm/libandroidemu.so
similarity index 100%
rename from system/lib/arm/libandroidemu.so
rename to src/system/lib/arm/libandroidemu.so
diff --git a/system/lib/arm/libandroidfw.so b/src/system/lib/arm/libandroidfw.so
similarity index 100%
rename from system/lib/arm/libandroidfw.so
rename to src/system/lib/arm/libandroidfw.so
diff --git a/system/lib/arm/libandroidicu.so b/src/system/lib/arm/libandroidicu.so
similarity index 100%
rename from system/lib/arm/libandroidicu.so
rename to src/system/lib/arm/libandroidicu.so
diff --git a/system/lib/arm/libappfuse.so b/src/system/lib/arm/libappfuse.so
similarity index 100%
rename from system/lib/arm/libappfuse.so
rename to src/system/lib/arm/libappfuse.so
diff --git a/system/lib/arm/libart.so b/src/system/lib/arm/libart.so
similarity index 100%
rename from system/lib/arm/libart.so
rename to src/system/lib/arm/libart.so
diff --git a/system/lib/arm/libartbase.so b/src/system/lib/arm/libartbase.so
similarity index 100%
rename from system/lib/arm/libartbase.so
rename to src/system/lib/arm/libartbase.so
diff --git a/system/lib/arm/libartpalette-system.so b/src/system/lib/arm/libartpalette-system.so
similarity index 100%
rename from system/lib/arm/libartpalette-system.so
rename to src/system/lib/arm/libartpalette-system.so
diff --git a/system/lib/arm/libartpalette.so b/src/system/lib/arm/libartpalette.so
similarity index 100%
rename from system/lib/arm/libartpalette.so
rename to src/system/lib/arm/libartpalette.so
diff --git a/system/lib/arm/libaudioclient.so b/src/system/lib/arm/libaudioclient.so
similarity index 100%
rename from system/lib/arm/libaudioclient.so
rename to src/system/lib/arm/libaudioclient.so
diff --git a/system/lib/arm/libaudioflinger.so b/src/system/lib/arm/libaudioflinger.so
similarity index 100%
rename from system/lib/arm/libaudioflinger.so
rename to src/system/lib/arm/libaudioflinger.so
diff --git a/system/lib/arm/libaudiofoundation.so b/src/system/lib/arm/libaudiofoundation.so
similarity index 100%
rename from system/lib/arm/libaudiofoundation.so
rename to src/system/lib/arm/libaudiofoundation.so
diff --git a/system/lib/arm/libaudiohal.so b/src/system/lib/arm/libaudiohal.so
similarity index 100%
rename from system/lib/arm/libaudiohal.so
rename to src/system/lib/arm/libaudiohal.so
diff --git a/system/lib/arm/libaudiohal@2.0.so b/src/system/lib/arm/libaudiohal@2.0.so
similarity index 100%
rename from system/lib/arm/libaudiohal@2.0.so
rename to src/system/lib/arm/libaudiohal@2.0.so
diff --git a/system/lib/arm/libaudiohal@4.0.so b/src/system/lib/arm/libaudiohal@4.0.so
similarity index 100%
rename from system/lib/arm/libaudiohal@4.0.so
rename to src/system/lib/arm/libaudiohal@4.0.so
diff --git a/system/lib/arm/libaudiohal@5.0.so b/src/system/lib/arm/libaudiohal@5.0.so
similarity index 100%
rename from system/lib/arm/libaudiohal@5.0.so
rename to src/system/lib/arm/libaudiohal@5.0.so
diff --git a/system/lib/arm/libaudiohal@6.0.so b/src/system/lib/arm/libaudiohal@6.0.so
similarity index 100%
rename from system/lib/arm/libaudiohal@6.0.so
rename to src/system/lib/arm/libaudiohal@6.0.so
diff --git a/system/lib/arm/libaudiohal_deathhandler.so b/src/system/lib/arm/libaudiohal_deathhandler.so
similarity index 100%
rename from system/lib/arm/libaudiohal_deathhandler.so
rename to src/system/lib/arm/libaudiohal_deathhandler.so
diff --git a/system/lib/arm/libaudiomanager.so b/src/system/lib/arm/libaudiomanager.so
similarity index 100%
rename from system/lib/arm/libaudiomanager.so
rename to src/system/lib/arm/libaudiomanager.so
diff --git a/system/lib/arm/libaudiopolicy.so b/src/system/lib/arm/libaudiopolicy.so
similarity index 100%
rename from system/lib/arm/libaudiopolicy.so
rename to src/system/lib/arm/libaudiopolicy.so
diff --git a/system/lib/arm/libaudioprocessing.so b/src/system/lib/arm/libaudioprocessing.so
similarity index 100%
rename from system/lib/arm/libaudioprocessing.so
rename to src/system/lib/arm/libaudioprocessing.so
diff --git a/system/lib/arm/libaudiospdif.so b/src/system/lib/arm/libaudiospdif.so
similarity index 100%
rename from system/lib/arm/libaudiospdif.so
rename to src/system/lib/arm/libaudiospdif.so
diff --git a/system/lib/arm/libaudioutils.so b/src/system/lib/arm/libaudioutils.so
similarity index 100%
rename from system/lib/arm/libaudioutils.so
rename to src/system/lib/arm/libaudioutils.so
diff --git a/system/lib/arm/libbacktrace.so b/src/system/lib/arm/libbacktrace.so
similarity index 100%
rename from system/lib/arm/libbacktrace.so
rename to src/system/lib/arm/libbacktrace.so
diff --git a/system/lib/arm/libbase.so b/src/system/lib/arm/libbase.so
similarity index 100%
rename from system/lib/arm/libbase.so
rename to src/system/lib/arm/libbase.so
diff --git a/system/lib/arm/libbcinfo.so b/src/system/lib/arm/libbcinfo.so
similarity index 100%
rename from system/lib/arm/libbcinfo.so
rename to src/system/lib/arm/libbcinfo.so
diff --git a/system/lib/arm/libbinder.so b/src/system/lib/arm/libbinder.so
similarity index 100%
rename from system/lib/arm/libbinder.so
rename to src/system/lib/arm/libbinder.so
diff --git a/system/lib/arm/libbinder_ndk.so b/src/system/lib/arm/libbinder_ndk.so
similarity index 100%
rename from system/lib/arm/libbinder_ndk.so
rename to src/system/lib/arm/libbinder_ndk.so
diff --git a/system/lib/arm/libblas.so b/src/system/lib/arm/libblas.so
similarity index 100%
rename from system/lib/arm/libblas.so
rename to src/system/lib/arm/libblas.so
diff --git a/system/lib/arm/libbpf.so b/src/system/lib/arm/libbpf.so
similarity index 100%
rename from system/lib/arm/libbpf.so
rename to src/system/lib/arm/libbpf.so
diff --git a/system/lib/arm/libbpf_android.so b/src/system/lib/arm/libbpf_android.so
similarity index 100%
rename from system/lib/arm/libbpf_android.so
rename to src/system/lib/arm/libbpf_android.so
diff --git a/system/lib/arm/libbufferhub.so b/src/system/lib/arm/libbufferhub.so
similarity index 100%
rename from system/lib/arm/libbufferhub.so
rename to src/system/lib/arm/libbufferhub.so
diff --git a/system/lib/arm/libbufferhubqueue.so b/src/system/lib/arm/libbufferhubqueue.so
similarity index 100%
rename from system/lib/arm/libbufferhubqueue.so
rename to src/system/lib/arm/libbufferhubqueue.so
diff --git a/system/lib/arm/libc++.so b/src/system/lib/arm/libc++.so
similarity index 100%
rename from system/lib/arm/libc++.so
rename to src/system/lib/arm/libc++.so
diff --git a/system/lib/arm/libc.so b/src/system/lib/arm/libc.so
similarity index 100%
rename from system/lib/arm/libc.so
rename to src/system/lib/arm/libc.so
diff --git a/system/lib/arm/libcamera2ndk.so b/src/system/lib/arm/libcamera2ndk.so
similarity index 100%
rename from system/lib/arm/libcamera2ndk.so
rename to src/system/lib/arm/libcamera2ndk.so
diff --git a/system/lib/arm/libcamera_client.so b/src/system/lib/arm/libcamera_client.so
similarity index 100%
rename from system/lib/arm/libcamera_client.so
rename to src/system/lib/arm/libcamera_client.so
diff --git a/system/lib/arm/libcamera_metadata.so b/src/system/lib/arm/libcamera_metadata.so
similarity index 100%
rename from system/lib/arm/libcamera_metadata.so
rename to src/system/lib/arm/libcamera_metadata.so
diff --git a/system/lib/arm/libcgrouprc.so b/src/system/lib/arm/libcgrouprc.so
similarity index 100%
rename from system/lib/arm/libcgrouprc.so
rename to src/system/lib/arm/libcgrouprc.so
diff --git a/system/lib/arm/libclcore.bc b/src/system/lib/arm/libclcore.bc
similarity index 100%
rename from system/lib/arm/libclcore.bc
rename to src/system/lib/arm/libclcore.bc
diff --git a/system/lib/arm/libclcore_debug.bc b/src/system/lib/arm/libclcore_debug.bc
similarity index 100%
rename from system/lib/arm/libclcore_debug.bc
rename to src/system/lib/arm/libclcore_debug.bc
diff --git a/system/lib/arm/libclcore_debug_g.bc b/src/system/lib/arm/libclcore_debug_g.bc
similarity index 100%
rename from system/lib/arm/libclcore_debug_g.bc
rename to src/system/lib/arm/libclcore_debug_g.bc
diff --git a/system/lib/arm/libclcore_g.bc b/src/system/lib/arm/libclcore_g.bc
similarity index 100%
rename from system/lib/arm/libclcore_g.bc
rename to src/system/lib/arm/libclcore_g.bc
diff --git a/system/lib/arm/libclcore_neon.bc b/src/system/lib/arm/libclcore_neon.bc
similarity index 100%
rename from system/lib/arm/libclcore_neon.bc
rename to src/system/lib/arm/libclcore_neon.bc
diff --git a/system/lib/arm/libcodec2.so b/src/system/lib/arm/libcodec2.so
similarity index 100%
rename from system/lib/arm/libcodec2.so
rename to src/system/lib/arm/libcodec2.so
diff --git a/system/lib/arm/libcodec2_client.so b/src/system/lib/arm/libcodec2_client.so
similarity index 100%
rename from system/lib/arm/libcodec2_client.so
rename to src/system/lib/arm/libcodec2_client.so
diff --git a/system/lib/arm/libcodec2_hidl_client@1.0.so b/src/system/lib/arm/libcodec2_hidl_client@1.0.so
similarity index 100%
rename from system/lib/arm/libcodec2_hidl_client@1.0.so
rename to src/system/lib/arm/libcodec2_hidl_client@1.0.so
diff --git a/system/lib/arm/libcodec2_hidl_client@1.1.so b/src/system/lib/arm/libcodec2_hidl_client@1.1.so
similarity index 100%
rename from system/lib/arm/libcodec2_hidl_client@1.1.so
rename to src/system/lib/arm/libcodec2_hidl_client@1.1.so
diff --git a/system/lib/arm/libcodec2_vndk.so b/src/system/lib/arm/libcodec2_vndk.so
similarity index 100%
rename from system/lib/arm/libcodec2_vndk.so
rename to src/system/lib/arm/libcodec2_vndk.so
diff --git a/system/lib/arm/libcompiler_rt.so b/src/system/lib/arm/libcompiler_rt.so
similarity index 100%
rename from system/lib/arm/libcompiler_rt.so
rename to src/system/lib/arm/libcompiler_rt.so
diff --git a/system/lib/arm/libcrypto.so b/src/system/lib/arm/libcrypto.so
similarity index 100%
rename from system/lib/arm/libcrypto.so
rename to src/system/lib/arm/libcrypto.so
diff --git a/system/lib/arm/libcutils.so b/src/system/lib/arm/libcutils.so
similarity index 100%
rename from system/lib/arm/libcutils.so
rename to src/system/lib/arm/libcutils.so
diff --git a/system/lib/arm/libdataloader.so b/src/system/lib/arm/libdataloader.so
similarity index 100%
rename from system/lib/arm/libdataloader.so
rename to src/system/lib/arm/libdataloader.so
diff --git a/system/lib/arm/libdatasource.so b/src/system/lib/arm/libdatasource.so
similarity index 100%
rename from system/lib/arm/libdatasource.so
rename to src/system/lib/arm/libdatasource.so
diff --git a/system/lib/arm/libdebuggerd_client.so b/src/system/lib/arm/libdebuggerd_client.so
similarity index 100%
rename from system/lib/arm/libdebuggerd_client.so
rename to src/system/lib/arm/libdebuggerd_client.so
diff --git a/system/lib/arm/libdexfile.so b/src/system/lib/arm/libdexfile.so
similarity index 100%
rename from system/lib/arm/libdexfile.so
rename to src/system/lib/arm/libdexfile.so
diff --git a/system/lib/arm/libdexfile_external.so b/src/system/lib/arm/libdexfile_external.so
similarity index 100%
rename from system/lib/arm/libdexfile_external.so
rename to src/system/lib/arm/libdexfile_external.so
diff --git a/system/lib/arm/libdexfile_support.so b/src/system/lib/arm/libdexfile_support.so
similarity index 100%
rename from system/lib/arm/libdexfile_support.so
rename to src/system/lib/arm/libdexfile_support.so
diff --git a/system/lib/arm/libdl.so b/src/system/lib/arm/libdl.so
similarity index 100%
rename from system/lib/arm/libdl.so
rename to src/system/lib/arm/libdl.so
diff --git a/system/lib/arm/libdl_android.so b/src/system/lib/arm/libdl_android.so
similarity index 100%
rename from system/lib/arm/libdl_android.so
rename to src/system/lib/arm/libdl_android.so
diff --git a/system/lib/arm/libdng_sdk.so b/src/system/lib/arm/libdng_sdk.so
similarity index 100%
rename from system/lib/arm/libdng_sdk.so
rename to src/system/lib/arm/libdng_sdk.so
diff --git a/system/lib/arm/libdrm.so b/src/system/lib/arm/libdrm.so
similarity index 100%
rename from system/lib/arm/libdrm.so
rename to src/system/lib/arm/libdrm.so
diff --git a/system/lib/arm/libexpat.so b/src/system/lib/arm/libexpat.so
similarity index 100%
rename from system/lib/arm/libexpat.so
rename to src/system/lib/arm/libexpat.so
diff --git a/system/lib/arm/libfmq.so b/src/system/lib/arm/libfmq.so
similarity index 100%
rename from system/lib/arm/libfmq.so
rename to src/system/lib/arm/libfmq.so
diff --git a/system/lib/arm/libft2.so b/src/system/lib/arm/libft2.so
similarity index 100%
rename from system/lib/arm/libft2.so
rename to src/system/lib/arm/libft2.so
diff --git a/system/lib/arm/libgralloctypes.so b/src/system/lib/arm/libgralloctypes.so
similarity index 100%
rename from system/lib/arm/libgralloctypes.so
rename to src/system/lib/arm/libgralloctypes.so
diff --git a/system/lib/arm/libgraphicsenv.so b/src/system/lib/arm/libgraphicsenv.so
similarity index 100%
rename from system/lib/arm/libgraphicsenv.so
rename to src/system/lib/arm/libgraphicsenv.so
diff --git a/system/lib/arm/libgui.so b/src/system/lib/arm/libgui.so
similarity index 100%
rename from system/lib/arm/libgui.so
rename to src/system/lib/arm/libgui.so
diff --git a/system/lib/arm/libhardware.so b/src/system/lib/arm/libhardware.so
similarity index 100%
rename from system/lib/arm/libhardware.so
rename to src/system/lib/arm/libhardware.so
diff --git a/system/lib/arm/libhardware_legacy.so b/src/system/lib/arm/libhardware_legacy.so
similarity index 100%
rename from system/lib/arm/libhardware_legacy.so
rename to src/system/lib/arm/libhardware_legacy.so
diff --git a/system/lib/arm/libharfbuzz_ng.so b/src/system/lib/arm/libharfbuzz_ng.so
similarity index 100%
rename from system/lib/arm/libharfbuzz_ng.so
rename to src/system/lib/arm/libharfbuzz_ng.so
diff --git a/system/lib/arm/libheif.so b/src/system/lib/arm/libheif.so
similarity index 100%
rename from system/lib/arm/libheif.so
rename to src/system/lib/arm/libheif.so
diff --git a/system/lib/arm/libhidl-gen-utils.so b/src/system/lib/arm/libhidl-gen-utils.so
similarity index 100%
rename from system/lib/arm/libhidl-gen-utils.so
rename to src/system/lib/arm/libhidl-gen-utils.so
diff --git a/system/lib/arm/libhidlallocatorutils.so b/src/system/lib/arm/libhidlallocatorutils.so
similarity index 100%
rename from system/lib/arm/libhidlallocatorutils.so
rename to src/system/lib/arm/libhidlallocatorutils.so
diff --git a/system/lib/arm/libhidlbase.so b/src/system/lib/arm/libhidlbase.so
similarity index 100%
rename from system/lib/arm/libhidlbase.so
rename to src/system/lib/arm/libhidlbase.so
diff --git a/system/lib/arm/libhidlmemory.so b/src/system/lib/arm/libhidlmemory.so
similarity index 100%
rename from system/lib/arm/libhidlmemory.so
rename to src/system/lib/arm/libhidlmemory.so
diff --git a/system/lib/arm/libhwui.so b/src/system/lib/arm/libhwui.so
similarity index 100%
rename from system/lib/arm/libhwui.so
rename to src/system/lib/arm/libhwui.so
diff --git a/system/lib/arm/libicui18n.so b/src/system/lib/arm/libicui18n.so
similarity index 100%
rename from system/lib/arm/libicui18n.so
rename to src/system/lib/arm/libicui18n.so
diff --git a/system/lib/arm/libicuuc.so b/src/system/lib/arm/libicuuc.so
similarity index 100%
rename from system/lib/arm/libicuuc.so
rename to src/system/lib/arm/libicuuc.so
diff --git a/system/lib/arm/libimg_utils.so b/src/system/lib/arm/libimg_utils.so
similarity index 100%
rename from system/lib/arm/libimg_utils.so
rename to src/system/lib/arm/libimg_utils.so
diff --git a/system/lib/arm/libincfs.so b/src/system/lib/arm/libincfs.so
similarity index 100%
rename from system/lib/arm/libincfs.so
rename to src/system/lib/arm/libincfs.so
diff --git a/system/lib/arm/libinput.so b/src/system/lib/arm/libinput.so
similarity index 100%
rename from system/lib/arm/libinput.so
rename to src/system/lib/arm/libinput.so
diff --git a/system/lib/arm/libion.so b/src/system/lib/arm/libion.so
similarity index 100%
rename from system/lib/arm/libion.so
rename to src/system/lib/arm/libion.so
diff --git a/system/lib/arm/libjnigraphics.so b/src/system/lib/arm/libjnigraphics.so
similarity index 100%
rename from system/lib/arm/libjnigraphics.so
rename to src/system/lib/arm/libjnigraphics.so
diff --git a/system/lib/arm/libjpeg.so b/src/system/lib/arm/libjpeg.so
similarity index 100%
rename from system/lib/arm/libjpeg.so
rename to src/system/lib/arm/libjpeg.so
diff --git a/system/lib/arm/liblayers_proto.so b/src/system/lib/arm/liblayers_proto.so
similarity index 100%
rename from system/lib/arm/liblayers_proto.so
rename to src/system/lib/arm/liblayers_proto.so
diff --git a/system/lib/arm/liblog.so b/src/system/lib/arm/liblog.so
similarity index 100%
rename from system/lib/arm/liblog.so
rename to src/system/lib/arm/liblog.so
diff --git a/system/lib/arm/liblzma.so b/src/system/lib/arm/liblzma.so
similarity index 100%
rename from system/lib/arm/liblzma.so
rename to src/system/lib/arm/liblzma.so
diff --git a/system/lib/arm/libm.so b/src/system/lib/arm/libm.so
similarity index 100%
rename from system/lib/arm/libm.so
rename to src/system/lib/arm/libm.so
diff --git a/system/lib/arm/libmedia.so b/src/system/lib/arm/libmedia.so
similarity index 100%
rename from system/lib/arm/libmedia.so
rename to src/system/lib/arm/libmedia.so
diff --git a/system/lib/arm/libmedia_codeclist.so b/src/system/lib/arm/libmedia_codeclist.so
similarity index 100%
rename from system/lib/arm/libmedia_codeclist.so
rename to src/system/lib/arm/libmedia_codeclist.so
diff --git a/system/lib/arm/libmedia_helper.so b/src/system/lib/arm/libmedia_helper.so
similarity index 100%
rename from system/lib/arm/libmedia_helper.so
rename to src/system/lib/arm/libmedia_helper.so
diff --git a/system/lib/arm/libmedia_jni_utils.so b/src/system/lib/arm/libmedia_jni_utils.so
similarity index 100%
rename from system/lib/arm/libmedia_jni_utils.so
rename to src/system/lib/arm/libmedia_jni_utils.so
diff --git a/system/lib/arm/libmedia_omx.so b/src/system/lib/arm/libmedia_omx.so
similarity index 100%
rename from system/lib/arm/libmedia_omx.so
rename to src/system/lib/arm/libmedia_omx.so
diff --git a/system/lib/arm/libmedia_omx_client.so b/src/system/lib/arm/libmedia_omx_client.so
similarity index 100%
rename from system/lib/arm/libmedia_omx_client.so
rename to src/system/lib/arm/libmedia_omx_client.so
diff --git a/system/lib/arm/libmediadrm.so b/src/system/lib/arm/libmediadrm.so
similarity index 100%
rename from system/lib/arm/libmediadrm.so
rename to src/system/lib/arm/libmediadrm.so
diff --git a/system/lib/arm/libmediadrmmetrics_lite.so b/src/system/lib/arm/libmediadrmmetrics_lite.so
similarity index 100%
rename from system/lib/arm/libmediadrmmetrics_lite.so
rename to src/system/lib/arm/libmediadrmmetrics_lite.so
diff --git a/system/lib/arm/libmedialogservice.so b/src/system/lib/arm/libmedialogservice.so
similarity index 100%
rename from system/lib/arm/libmedialogservice.so
rename to src/system/lib/arm/libmedialogservice.so
diff --git a/system/lib/arm/libmediametrics.so b/src/system/lib/arm/libmediametrics.so
similarity index 100%
rename from system/lib/arm/libmediametrics.so
rename to src/system/lib/arm/libmediametrics.so
diff --git a/system/lib/arm/libmediandk.so b/src/system/lib/arm/libmediandk.so
similarity index 100%
rename from system/lib/arm/libmediandk.so
rename to src/system/lib/arm/libmediandk.so
diff --git a/system/lib/arm/libmediandk_utils.so b/src/system/lib/arm/libmediandk_utils.so
similarity index 100%
rename from system/lib/arm/libmediandk_utils.so
rename to src/system/lib/arm/libmediandk_utils.so
diff --git a/system/lib/arm/libmediautils.so b/src/system/lib/arm/libmediautils.so
similarity index 100%
rename from system/lib/arm/libmediautils.so
rename to src/system/lib/arm/libmediautils.so
diff --git a/system/lib/arm/libmeminfo.so b/src/system/lib/arm/libmeminfo.so
similarity index 100%
rename from system/lib/arm/libmeminfo.so
rename to src/system/lib/arm/libmeminfo.so
diff --git a/system/lib/arm/libmemtrack.so b/src/system/lib/arm/libmemtrack.so
similarity index 100%
rename from system/lib/arm/libmemtrack.so
rename to src/system/lib/arm/libmemtrack.so
diff --git a/system/lib/arm/libmemunreachable.so b/src/system/lib/arm/libmemunreachable.so
similarity index 100%
rename from system/lib/arm/libmemunreachable.so
rename to src/system/lib/arm/libmemunreachable.so
diff --git a/system/lib/arm/libminigbm_gralloc_arcvm.so b/src/system/lib/arm/libminigbm_gralloc_arcvm.so
similarity index 100%
rename from system/lib/arm/libminigbm_gralloc_arcvm.so
rename to src/system/lib/arm/libminigbm_gralloc_arcvm.so
diff --git a/system/lib/arm/libminikin.so b/src/system/lib/arm/libminikin.so
similarity index 100%
rename from system/lib/arm/libminikin.so
rename to src/system/lib/arm/libminikin.so
diff --git a/system/lib/arm/libnativebridge.so b/src/system/lib/arm/libnativebridge.so
similarity index 100%
rename from system/lib/arm/libnativebridge.so
rename to src/system/lib/arm/libnativebridge.so
diff --git a/system/lib/arm/libnativebridge_lazy.so b/src/system/lib/arm/libnativebridge_lazy.so
similarity index 100%
rename from system/lib/arm/libnativebridge_lazy.so
rename to src/system/lib/arm/libnativebridge_lazy.so
diff --git a/system/lib/arm/libnativedisplay.so b/src/system/lib/arm/libnativedisplay.so
similarity index 100%
rename from system/lib/arm/libnativedisplay.so
rename to src/system/lib/arm/libnativedisplay.so
diff --git a/system/lib/arm/libnativehelper.so b/src/system/lib/arm/libnativehelper.so
similarity index 100%
rename from system/lib/arm/libnativehelper.so
rename to src/system/lib/arm/libnativehelper.so
diff --git a/system/lib/arm/libnativeloader.so b/src/system/lib/arm/libnativeloader.so
similarity index 100%
rename from system/lib/arm/libnativeloader.so
rename to src/system/lib/arm/libnativeloader.so
diff --git a/system/lib/arm/libnativeloader_lazy.so b/src/system/lib/arm/libnativeloader_lazy.so
similarity index 100%
rename from system/lib/arm/libnativeloader_lazy.so
rename to src/system/lib/arm/libnativeloader_lazy.so
diff --git a/system/lib/arm/libnativewindow.so b/src/system/lib/arm/libnativewindow.so
similarity index 100%
rename from system/lib/arm/libnativewindow.so
rename to src/system/lib/arm/libnativewindow.so
diff --git a/system/lib/arm/libnbaio.so b/src/system/lib/arm/libnbaio.so
similarity index 100%
rename from system/lib/arm/libnbaio.so
rename to src/system/lib/arm/libnbaio.so
diff --git a/system/lib/arm/libnblog.so b/src/system/lib/arm/libnblog.so
similarity index 100%
rename from system/lib/arm/libnblog.so
rename to src/system/lib/arm/libnblog.so
diff --git a/system/lib/arm/libnetd_client.so b/src/system/lib/arm/libnetd_client.so
similarity index 100%
rename from system/lib/arm/libnetd_client.so
rename to src/system/lib/arm/libnetd_client.so
diff --git a/system/lib/arm/libnetdbpf.so b/src/system/lib/arm/libnetdbpf.so
similarity index 100%
rename from system/lib/arm/libnetdbpf.so
rename to src/system/lib/arm/libnetdbpf.so
diff --git a/system/lib/arm/libnetdutils.so b/src/system/lib/arm/libnetdutils.so
similarity index 100%
rename from system/lib/arm/libnetdutils.so
rename to src/system/lib/arm/libnetdutils.so
diff --git a/system/lib/arm/libneuralnetworks.so b/src/system/lib/arm/libneuralnetworks.so
similarity index 100%
rename from system/lib/arm/libneuralnetworks.so
rename to src/system/lib/arm/libneuralnetworks.so
diff --git a/system/lib/arm/libneuralnetworks_packageinfo.so b/src/system/lib/arm/libneuralnetworks_packageinfo.so
similarity index 100%
rename from system/lib/arm/libneuralnetworks_packageinfo.so
rename to src/system/lib/arm/libneuralnetworks_packageinfo.so
diff --git a/system/lib/arm/libpackagelistparser.so b/src/system/lib/arm/libpackagelistparser.so
similarity index 100%
rename from system/lib/arm/libpackagelistparser.so
rename to src/system/lib/arm/libpackagelistparser.so
diff --git a/system/lib/arm/libpcre2.so b/src/system/lib/arm/libpcre2.so
similarity index 100%
rename from system/lib/arm/libpcre2.so
rename to src/system/lib/arm/libpcre2.so
diff --git a/system/lib/arm/libpdfium.so b/src/system/lib/arm/libpdfium.so
similarity index 100%
rename from system/lib/arm/libpdfium.so
rename to src/system/lib/arm/libpdfium.so
diff --git a/system/lib/arm/libpdx_default_transport.so b/src/system/lib/arm/libpdx_default_transport.so
similarity index 100%
rename from system/lib/arm/libpdx_default_transport.so
rename to src/system/lib/arm/libpdx_default_transport.so
diff --git a/system/lib/arm/libpiex.so b/src/system/lib/arm/libpiex.so
similarity index 100%
rename from system/lib/arm/libpiex.so
rename to src/system/lib/arm/libpiex.so
diff --git a/system/lib/arm/libpng.so b/src/system/lib/arm/libpng.so
similarity index 100%
rename from system/lib/arm/libpng.so
rename to src/system/lib/arm/libpng.so
diff --git a/system/lib/arm/libpowermanager.so b/src/system/lib/arm/libpowermanager.so
similarity index 100%
rename from system/lib/arm/libpowermanager.so
rename to src/system/lib/arm/libpowermanager.so
diff --git a/system/lib/arm/libprocessgroup.so b/src/system/lib/arm/libprocessgroup.so
similarity index 100%
rename from system/lib/arm/libprocessgroup.so
rename to src/system/lib/arm/libprocessgroup.so
diff --git a/system/lib/arm/libprocinfo.so b/src/system/lib/arm/libprocinfo.so
similarity index 100%
rename from system/lib/arm/libprocinfo.so
rename to src/system/lib/arm/libprocinfo.so
diff --git a/system/lib/arm/libprofile.so b/src/system/lib/arm/libprofile.so
similarity index 100%
rename from system/lib/arm/libprofile.so
rename to src/system/lib/arm/libprofile.so
diff --git a/system/lib/arm/libprotobuf-cpp-lite.so b/src/system/lib/arm/libprotobuf-cpp-lite.so
similarity index 100%
rename from system/lib/arm/libprotobuf-cpp-lite.so
rename to src/system/lib/arm/libprotobuf-cpp-lite.so
diff --git a/system/lib/arm/libprotoutil.so b/src/system/lib/arm/libprotoutil.so
similarity index 100%
rename from system/lib/arm/libprotoutil.so
rename to src/system/lib/arm/libprotoutil.so
diff --git a/system/lib/arm/libselinux.so b/src/system/lib/arm/libselinux.so
similarity index 100%
rename from system/lib/arm/libselinux.so
rename to src/system/lib/arm/libselinux.so
diff --git a/system/lib/arm/libsensor.so b/src/system/lib/arm/libsensor.so
similarity index 100%
rename from system/lib/arm/libsensor.so
rename to src/system/lib/arm/libsensor.so
diff --git a/system/lib/arm/libsfplugin_ccodec.so b/src/system/lib/arm/libsfplugin_ccodec.so
similarity index 100%
rename from system/lib/arm/libsfplugin_ccodec.so
rename to src/system/lib/arm/libsfplugin_ccodec.so
diff --git a/system/lib/arm/libsfplugin_ccodec_utils.so b/src/system/lib/arm/libsfplugin_ccodec_utils.so
similarity index 100%
rename from system/lib/arm/libsfplugin_ccodec_utils.so
rename to src/system/lib/arm/libsfplugin_ccodec_utils.so
diff --git a/system/lib/arm/libsigchain.so b/src/system/lib/arm/libsigchain.so
similarity index 100%
rename from system/lib/arm/libsigchain.so
rename to src/system/lib/arm/libsigchain.so
diff --git a/system/lib/arm/libsonic.so b/src/system/lib/arm/libsonic.so
similarity index 100%
rename from system/lib/arm/libsonic.so
rename to src/system/lib/arm/libsonic.so
diff --git a/system/lib/arm/libspeexresampler.so b/src/system/lib/arm/libspeexresampler.so
similarity index 100%
rename from system/lib/arm/libspeexresampler.so
rename to src/system/lib/arm/libspeexresampler.so
diff --git a/system/lib/arm/libsqlite.so b/src/system/lib/arm/libsqlite.so
similarity index 100%
rename from system/lib/arm/libsqlite.so
rename to src/system/lib/arm/libsqlite.so
diff --git a/system/lib/arm/libssl.so b/src/system/lib/arm/libssl.so
similarity index 100%
rename from system/lib/arm/libssl.so
rename to src/system/lib/arm/libssl.so
diff --git a/system/lib/arm/libstagefright.so b/src/system/lib/arm/libstagefright.so
similarity index 100%
rename from system/lib/arm/libstagefright.so
rename to src/system/lib/arm/libstagefright.so
diff --git a/system/lib/arm/libstagefright_bufferpool@2.0.1.so b/src/system/lib/arm/libstagefright_bufferpool@2.0.1.so
similarity index 100%
rename from system/lib/arm/libstagefright_bufferpool@2.0.1.so
rename to src/system/lib/arm/libstagefright_bufferpool@2.0.1.so
diff --git a/system/lib/arm/libstagefright_bufferqueue_helper.so b/src/system/lib/arm/libstagefright_bufferqueue_helper.so
similarity index 100%
rename from system/lib/arm/libstagefright_bufferqueue_helper.so
rename to src/system/lib/arm/libstagefright_bufferqueue_helper.so
diff --git a/system/lib/arm/libstagefright_codecbase.so b/src/system/lib/arm/libstagefright_codecbase.so
similarity index 100%
rename from system/lib/arm/libstagefright_codecbase.so
rename to src/system/lib/arm/libstagefright_codecbase.so
diff --git a/system/lib/arm/libstagefright_foundation.so b/src/system/lib/arm/libstagefright_foundation.so
similarity index 100%
rename from system/lib/arm/libstagefright_foundation.so
rename to src/system/lib/arm/libstagefright_foundation.so
diff --git a/system/lib/arm/libstagefright_framecapture_utils.so b/src/system/lib/arm/libstagefright_framecapture_utils.so
similarity index 100%
rename from system/lib/arm/libstagefright_framecapture_utils.so
rename to src/system/lib/arm/libstagefright_framecapture_utils.so
diff --git a/system/lib/arm/libstagefright_http_support.so b/src/system/lib/arm/libstagefright_http_support.so
similarity index 100%
rename from system/lib/arm/libstagefright_http_support.so
rename to src/system/lib/arm/libstagefright_http_support.so
diff --git a/system/lib/arm/libstagefright_omx.so b/src/system/lib/arm/libstagefright_omx.so
similarity index 100%
rename from system/lib/arm/libstagefright_omx.so
rename to src/system/lib/arm/libstagefright_omx.so
diff --git a/system/lib/arm/libstagefright_omx_utils.so b/src/system/lib/arm/libstagefright_omx_utils.so
similarity index 100%
rename from system/lib/arm/libstagefright_omx_utils.so
rename to src/system/lib/arm/libstagefright_omx_utils.so
diff --git a/system/lib/arm/libstagefright_xmlparser.so b/src/system/lib/arm/libstagefright_xmlparser.so
similarity index 100%
rename from system/lib/arm/libstagefright_xmlparser.so
rename to src/system/lib/arm/libstagefright_xmlparser.so
diff --git a/system/lib/arm/libstatslog.so b/src/system/lib/arm/libstatslog.so
similarity index 100%
rename from system/lib/arm/libstatslog.so
rename to src/system/lib/arm/libstatslog.so
diff --git a/system/lib/arm/libstatspull.so b/src/system/lib/arm/libstatspull.so
similarity index 100%
rename from system/lib/arm/libstatspull.so
rename to src/system/lib/arm/libstatspull.so
diff --git a/system/lib/arm/libstatssocket.so b/src/system/lib/arm/libstatssocket.so
similarity index 100%
rename from system/lib/arm/libstatssocket.so
rename to src/system/lib/arm/libstatssocket.so
diff --git a/system/lib/arm/libstdc++.so b/src/system/lib/arm/libstdc++.so
similarity index 100%
rename from system/lib/arm/libstdc++.so
rename to src/system/lib/arm/libstdc++.so
diff --git a/system/lib/arm/libsurfaceflinger.so b/src/system/lib/arm/libsurfaceflinger.so
similarity index 100%
rename from system/lib/arm/libsurfaceflinger.so
rename to src/system/lib/arm/libsurfaceflinger.so
diff --git a/system/lib/arm/libsync.so b/src/system/lib/arm/libsync.so
similarity index 100%
rename from system/lib/arm/libsync.so
rename to src/system/lib/arm/libsync.so
diff --git a/system/lib/arm/libtimeinstate.so b/src/system/lib/arm/libtimeinstate.so
similarity index 100%
rename from system/lib/arm/libtimeinstate.so
rename to src/system/lib/arm/libtimeinstate.so
diff --git a/system/lib/arm/libtimestats.so b/src/system/lib/arm/libtimestats.so
similarity index 100%
rename from system/lib/arm/libtimestats.so
rename to src/system/lib/arm/libtimestats.so
diff --git a/system/lib/arm/libtimestats_proto.so b/src/system/lib/arm/libtimestats_proto.so
similarity index 100%
rename from system/lib/arm/libtimestats_proto.so
rename to src/system/lib/arm/libtimestats_proto.so
diff --git a/system/lib/arm/libtinyxml2.so b/src/system/lib/arm/libtinyxml2.so
similarity index 100%
rename from system/lib/arm/libtinyxml2.so
rename to src/system/lib/arm/libtinyxml2.so
diff --git a/system/lib/arm/libtombstoned_client.so b/src/system/lib/arm/libtombstoned_client.so
similarity index 100%
rename from system/lib/arm/libtombstoned_client.so
rename to src/system/lib/arm/libtombstoned_client.so
diff --git a/system/lib/arm/libui.so b/src/system/lib/arm/libui.so
similarity index 100%
rename from system/lib/arm/libui.so
rename to src/system/lib/arm/libui.so
diff --git a/system/lib/arm/libunwindstack.so b/src/system/lib/arm/libunwindstack.so
similarity index 100%
rename from system/lib/arm/libunwindstack.so
rename to src/system/lib/arm/libunwindstack.so
diff --git a/system/lib/arm/libusbhost.so b/src/system/lib/arm/libusbhost.so
similarity index 100%
rename from system/lib/arm/libusbhost.so
rename to src/system/lib/arm/libusbhost.so
diff --git a/system/lib/arm/libutils.so b/src/system/lib/arm/libutils.so
similarity index 100%
rename from system/lib/arm/libutils.so
rename to src/system/lib/arm/libutils.so
diff --git a/system/lib/arm/libutilscallstack.so b/src/system/lib/arm/libutilscallstack.so
similarity index 100%
rename from system/lib/arm/libutilscallstack.so
rename to src/system/lib/arm/libutilscallstack.so
diff --git a/system/lib/arm/libvibrator.so b/src/system/lib/arm/libvibrator.so
similarity index 100%
rename from system/lib/arm/libvibrator.so
rename to src/system/lib/arm/libvibrator.so
diff --git a/system/lib/arm/libvintf.so b/src/system/lib/arm/libvintf.so
similarity index 100%
rename from system/lib/arm/libvintf.so
rename to src/system/lib/arm/libvintf.so
diff --git a/system/lib/arm/libvndksupport.so b/src/system/lib/arm/libvndksupport.so
similarity index 100%
rename from system/lib/arm/libvndksupport.so
rename to src/system/lib/arm/libvndksupport.so
diff --git a/system/lib/arm/libvulkan.so b/src/system/lib/arm/libvulkan.so
similarity index 100%
rename from system/lib/arm/libvulkan.so
rename to src/system/lib/arm/libvulkan.so
diff --git a/system/lib/arm/libvulkan_enc.so b/src/system/lib/arm/libvulkan_enc.so
similarity index 100%
rename from system/lib/arm/libvulkan_enc.so
rename to src/system/lib/arm/libvulkan_enc.so
diff --git a/system/lib/arm/libwebviewchromium_plat_support.so b/src/system/lib/arm/libwebviewchromium_plat_support.so
similarity index 100%
rename from system/lib/arm/libwebviewchromium_plat_support.so
rename to src/system/lib/arm/libwebviewchromium_plat_support.so
diff --git a/system/lib/arm/libwilhelm.so b/src/system/lib/arm/libwilhelm.so
similarity index 100%
rename from system/lib/arm/libwilhelm.so
rename to src/system/lib/arm/libwilhelm.so
diff --git a/system/lib/arm/libxml2.so b/src/system/lib/arm/libxml2.so
similarity index 100%
rename from system/lib/arm/libxml2.so
rename to src/system/lib/arm/libxml2.so
diff --git a/system/lib/arm/libz.so b/src/system/lib/arm/libz.so
similarity index 100%
rename from system/lib/arm/libz.so
rename to src/system/lib/arm/libz.so
diff --git a/system/lib/arm/libziparchive.so b/src/system/lib/arm/libziparchive.so
similarity index 100%
rename from system/lib/arm/libziparchive.so
rename to src/system/lib/arm/libziparchive.so
diff --git a/system/lib/arm/nb/ld-android.so b/src/system/lib/arm/nb/ld-android.so
similarity index 100%
rename from system/lib/arm/nb/ld-android.so
rename to src/system/lib/arm/nb/ld-android.so
diff --git a/system/lib/arm/nb/libEGL.so b/src/system/lib/arm/nb/libEGL.so
similarity index 100%
rename from system/lib/arm/nb/libEGL.so
rename to src/system/lib/arm/nb/libEGL.so
diff --git a/system/lib/arm/nb/libGLESv1_CM.so b/src/system/lib/arm/nb/libGLESv1_CM.so
similarity index 100%
rename from system/lib/arm/nb/libGLESv1_CM.so
rename to src/system/lib/arm/nb/libGLESv1_CM.so
diff --git a/system/lib/arm/nb/libGLESv2.so b/src/system/lib/arm/nb/libGLESv2.so
similarity index 100%
rename from system/lib/arm/nb/libGLESv2.so
rename to src/system/lib/arm/nb/libGLESv2.so
diff --git a/system/lib/arm/nb/libGLESv3.so b/src/system/lib/arm/nb/libGLESv3.so
similarity index 100%
rename from system/lib/arm/nb/libGLESv3.so
rename to src/system/lib/arm/nb/libGLESv3.so
diff --git a/system/lib/arm/nb/libOpenMAXAL.so b/src/system/lib/arm/nb/libOpenMAXAL.so
similarity index 100%
rename from system/lib/arm/nb/libOpenMAXAL.so
rename to src/system/lib/arm/nb/libOpenMAXAL.so
diff --git a/system/lib/arm/nb/libOpenSLES.so b/src/system/lib/arm/nb/libOpenSLES.so
similarity index 100%
rename from system/lib/arm/nb/libOpenSLES.so
rename to src/system/lib/arm/nb/libOpenSLES.so
diff --git a/system/lib/arm/nb/libRS.so b/src/system/lib/arm/nb/libRS.so
similarity index 100%
rename from system/lib/arm/nb/libRS.so
rename to src/system/lib/arm/nb/libRS.so
diff --git a/system/lib/arm/nb/libaaudio.so b/src/system/lib/arm/nb/libaaudio.so
similarity index 100%
rename from system/lib/arm/nb/libaaudio.so
rename to src/system/lib/arm/nb/libaaudio.so
diff --git a/system/lib/arm/nb/libamidi.so b/src/system/lib/arm/nb/libamidi.so
similarity index 100%
rename from system/lib/arm/nb/libamidi.so
rename to src/system/lib/arm/nb/libamidi.so
diff --git a/system/lib/arm/nb/libandroid.so b/src/system/lib/arm/nb/libandroid.so
similarity index 100%
rename from system/lib/arm/nb/libandroid.so
rename to src/system/lib/arm/nb/libandroid.so
diff --git a/system/lib/arm/nb/libandroid_net.so b/src/system/lib/arm/nb/libandroid_net.so
similarity index 100%
rename from system/lib/arm/nb/libandroid_net.so
rename to src/system/lib/arm/nb/libandroid_net.so
diff --git a/system/lib/arm/nb/libandroid_runtime.so b/src/system/lib/arm/nb/libandroid_runtime.so
similarity index 100%
rename from system/lib/arm/nb/libandroid_runtime.so
rename to src/system/lib/arm/nb/libandroid_runtime.so
diff --git a/system/lib/arm/nb/libandroid_runtime_lazy.so b/src/system/lib/arm/nb/libandroid_runtime_lazy.so
similarity index 100%
rename from system/lib/arm/nb/libandroid_runtime_lazy.so
rename to src/system/lib/arm/nb/libandroid_runtime_lazy.so
diff --git a/system/lib/arm/nb/libart.so b/src/system/lib/arm/nb/libart.so
similarity index 100%
rename from system/lib/arm/nb/libart.so
rename to src/system/lib/arm/nb/libart.so
diff --git a/system/lib/arm/nb/libaudioflinger.so b/src/system/lib/arm/nb/libaudioflinger.so
similarity index 100%
rename from system/lib/arm/nb/libaudioflinger.so
rename to src/system/lib/arm/nb/libaudioflinger.so
diff --git a/system/lib/arm/nb/libbinder.so b/src/system/lib/arm/nb/libbinder.so
similarity index 100%
rename from system/lib/arm/nb/libbinder.so
rename to src/system/lib/arm/nb/libbinder.so
diff --git a/system/lib/arm/nb/libbinder_ndk.so b/src/system/lib/arm/nb/libbinder_ndk.so
similarity index 100%
rename from system/lib/arm/nb/libbinder_ndk.so
rename to src/system/lib/arm/nb/libbinder_ndk.so
diff --git a/system/lib/arm/nb/libc.so b/src/system/lib/arm/nb/libc.so
similarity index 100%
rename from system/lib/arm/nb/libc.so
rename to src/system/lib/arm/nb/libc.so
diff --git a/system/lib/arm/nb/libcamera2ndk.so b/src/system/lib/arm/nb/libcamera2ndk.so
similarity index 100%
rename from system/lib/arm/nb/libcamera2ndk.so
rename to src/system/lib/arm/nb/libcamera2ndk.so
diff --git a/system/lib/arm/nb/libcamera_client.so b/src/system/lib/arm/nb/libcamera_client.so
similarity index 100%
rename from system/lib/arm/nb/libcamera_client.so
rename to src/system/lib/arm/nb/libcamera_client.so
diff --git a/system/lib/arm/nb/libcgrouprc.so b/src/system/lib/arm/nb/libcgrouprc.so
similarity index 100%
rename from system/lib/arm/nb/libcgrouprc.so
rename to src/system/lib/arm/nb/libcgrouprc.so
diff --git a/system/lib/arm/nb/libcrypto.so b/src/system/lib/arm/nb/libcrypto.so
similarity index 100%
rename from system/lib/arm/nb/libcrypto.so
rename to src/system/lib/arm/nb/libcrypto.so
diff --git a/system/lib/arm/nb/libcutils.so b/src/system/lib/arm/nb/libcutils.so
similarity index 100%
rename from system/lib/arm/nb/libcutils.so
rename to src/system/lib/arm/nb/libcutils.so
diff --git a/system/lib/arm/nb/libdl.so b/src/system/lib/arm/nb/libdl.so
similarity index 100%
rename from system/lib/arm/nb/libdl.so
rename to src/system/lib/arm/nb/libdl.so
diff --git a/system/lib/arm/nb/libdl_android.so b/src/system/lib/arm/nb/libdl_android.so
similarity index 100%
rename from system/lib/arm/nb/libdl_android.so
rename to src/system/lib/arm/nb/libdl_android.so
diff --git a/system/lib/arm/nb/libexpat.so b/src/system/lib/arm/nb/libexpat.so
similarity index 100%
rename from system/lib/arm/nb/libexpat.so
rename to src/system/lib/arm/nb/libexpat.so
diff --git a/system/lib/arm/nb/libft2.so b/src/system/lib/arm/nb/libft2.so
similarity index 100%
rename from system/lib/arm/nb/libft2.so
rename to src/system/lib/arm/nb/libft2.so
diff --git a/system/lib/arm/nb/libgui.so b/src/system/lib/arm/nb/libgui.so
similarity index 100%
rename from system/lib/arm/nb/libgui.so
rename to src/system/lib/arm/nb/libgui.so
diff --git a/system/lib/arm/nb/libhardware.so b/src/system/lib/arm/nb/libhardware.so
similarity index 100%
rename from system/lib/arm/nb/libhardware.so
rename to src/system/lib/arm/nb/libhardware.so
diff --git a/system/lib/arm/nb/libhardware_legacy.so b/src/system/lib/arm/nb/libhardware_legacy.so
similarity index 100%
rename from system/lib/arm/nb/libhardware_legacy.so
rename to src/system/lib/arm/nb/libhardware_legacy.so
diff --git a/system/lib/arm/nb/libhwui.so b/src/system/lib/arm/nb/libhwui.so
similarity index 100%
rename from system/lib/arm/nb/libhwui.so
rename to src/system/lib/arm/nb/libhwui.so
diff --git a/system/lib/arm/nb/libicui18n.so b/src/system/lib/arm/nb/libicui18n.so
similarity index 100%
rename from system/lib/arm/nb/libicui18n.so
rename to src/system/lib/arm/nb/libicui18n.so
diff --git a/system/lib/arm/nb/libicuuc.so b/src/system/lib/arm/nb/libicuuc.so
similarity index 100%
rename from system/lib/arm/nb/libicuuc.so
rename to src/system/lib/arm/nb/libicuuc.so
diff --git a/system/lib/arm/nb/libjnigraphics.so b/src/system/lib/arm/nb/libjnigraphics.so
similarity index 100%
rename from system/lib/arm/nb/libjnigraphics.so
rename to src/system/lib/arm/nb/libjnigraphics.so
diff --git a/system/lib/arm/nb/liblog.so b/src/system/lib/arm/nb/liblog.so
similarity index 100%
rename from system/lib/arm/nb/liblog.so
rename to src/system/lib/arm/nb/liblog.so
diff --git a/system/lib/arm/nb/libm.so b/src/system/lib/arm/nb/libm.so
similarity index 100%
rename from system/lib/arm/nb/libm.so
rename to src/system/lib/arm/nb/libm.so
diff --git a/system/lib/arm/nb/libmedia.so b/src/system/lib/arm/nb/libmedia.so
similarity index 100%
rename from system/lib/arm/nb/libmedia.so
rename to src/system/lib/arm/nb/libmedia.so
diff --git a/system/lib/arm/nb/libmediandk.so b/src/system/lib/arm/nb/libmediandk.so
similarity index 100%
rename from system/lib/arm/nb/libmediandk.so
rename to src/system/lib/arm/nb/libmediandk.so
diff --git a/system/lib/arm/nb/libnativehelper.so b/src/system/lib/arm/nb/libnativehelper.so
similarity index 100%
rename from system/lib/arm/nb/libnativehelper.so
rename to src/system/lib/arm/nb/libnativehelper.so
diff --git a/system/lib/arm/nb/libnativewindow.so b/src/system/lib/arm/nb/libnativewindow.so
similarity index 100%
rename from system/lib/arm/nb/libnativewindow.so
rename to src/system/lib/arm/nb/libnativewindow.so
diff --git a/system/lib/arm/nb/libneuralnetworks.so b/src/system/lib/arm/nb/libneuralnetworks.so
similarity index 100%
rename from system/lib/arm/nb/libneuralnetworks.so
rename to src/system/lib/arm/nb/libneuralnetworks.so
diff --git a/system/lib/arm/nb/libpcre2.so b/src/system/lib/arm/nb/libpcre2.so
similarity index 100%
rename from system/lib/arm/nb/libpcre2.so
rename to src/system/lib/arm/nb/libpcre2.so
diff --git a/system/lib/arm/nb/libsqlite.so b/src/system/lib/arm/nb/libsqlite.so
similarity index 100%
rename from system/lib/arm/nb/libsqlite.so
rename to src/system/lib/arm/nb/libsqlite.so
diff --git a/system/lib/arm/nb/libssl.so b/src/system/lib/arm/nb/libssl.so
similarity index 100%
rename from system/lib/arm/nb/libssl.so
rename to src/system/lib/arm/nb/libssl.so
diff --git a/system/lib/arm/nb/libstagefright.so b/src/system/lib/arm/nb/libstagefright.so
similarity index 100%
rename from system/lib/arm/nb/libstagefright.so
rename to src/system/lib/arm/nb/libstagefright.so
diff --git a/system/lib/arm/nb/libstagefright_foundation.so b/src/system/lib/arm/nb/libstagefright_foundation.so
similarity index 100%
rename from system/lib/arm/nb/libstagefright_foundation.so
rename to src/system/lib/arm/nb/libstagefright_foundation.so
diff --git a/system/lib/arm/nb/libstdc++.so b/src/system/lib/arm/nb/libstdc++.so
similarity index 100%
rename from system/lib/arm/nb/libstdc++.so
rename to src/system/lib/arm/nb/libstdc++.so
diff --git a/system/lib/arm/nb/libsurfaceflinger.so b/src/system/lib/arm/nb/libsurfaceflinger.so
similarity index 100%
rename from system/lib/arm/nb/libsurfaceflinger.so
rename to src/system/lib/arm/nb/libsurfaceflinger.so
diff --git a/system/lib/arm/nb/libsync.so b/src/system/lib/arm/nb/libsync.so
similarity index 100%
rename from system/lib/arm/nb/libsync.so
rename to src/system/lib/arm/nb/libsync.so
diff --git a/system/lib/arm/nb/libtcb.so b/src/system/lib/arm/nb/libtcb.so
similarity index 100%
rename from system/lib/arm/nb/libtcb.so
rename to src/system/lib/arm/nb/libtcb.so
diff --git a/system/lib/arm/nb/libui.so b/src/system/lib/arm/nb/libui.so
similarity index 100%
rename from system/lib/arm/nb/libui.so
rename to src/system/lib/arm/nb/libui.so
diff --git a/system/lib/arm/nb/libutils.so b/src/system/lib/arm/nb/libutils.so
similarity index 100%
rename from system/lib/arm/nb/libutils.so
rename to src/system/lib/arm/nb/libutils.so
diff --git a/system/lib/arm/nb/libvndksupport.so b/src/system/lib/arm/nb/libvndksupport.so
similarity index 100%
rename from system/lib/arm/nb/libvndksupport.so
rename to src/system/lib/arm/nb/libvndksupport.so
diff --git a/system/lib/arm/nb/libvulkan.so b/src/system/lib/arm/nb/libvulkan.so
similarity index 100%
rename from system/lib/arm/nb/libvulkan.so
rename to src/system/lib/arm/nb/libvulkan.so
diff --git a/system/lib/arm/nb/libwebviewchromium_plat_support.so b/src/system/lib/arm/nb/libwebviewchromium_plat_support.so
similarity index 100%
rename from system/lib/arm/nb/libwebviewchromium_plat_support.so
rename to src/system/lib/arm/nb/libwebviewchromium_plat_support.so
diff --git a/system/lib/arm/nb/libz.so b/src/system/lib/arm/nb/libz.so
similarity index 100%
rename from system/lib/arm/nb/libz.so
rename to src/system/lib/arm/nb/libz.so
diff --git a/system/lib/arm/server_configurable_flags.so b/src/system/lib/arm/server_configurable_flags.so
similarity index 100%
rename from system/lib/arm/server_configurable_flags.so
rename to src/system/lib/arm/server_configurable_flags.so
diff --git a/system/lib/libhoudini.so b/src/system/lib/libhoudini.so
similarity index 100%
rename from system/lib/libhoudini.so
rename to src/system/lib/libhoudini.so
diff --git a/system/lib64/arm64/android.frameworks.bufferhub@1.0.so b/src/system/lib64/arm64/android.frameworks.bufferhub@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.frameworks.bufferhub@1.0.so
rename to src/system/lib64/arm64/android.frameworks.bufferhub@1.0.so
diff --git a/system/lib64/arm64/android.frameworks.vr.composer@2.0.so b/src/system/lib64/arm64/android.frameworks.vr.composer@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.frameworks.vr.composer@2.0.so
rename to src/system/lib64/arm64/android.frameworks.vr.composer@2.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.common-util.so b/src/system/lib64/arm64/android.hardware.audio.common-util.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common-util.so
rename to src/system/lib64/arm64/android.hardware.audio.common-util.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@2.0-util.so b/src/system/lib64/arm64/android.hardware.audio.common@2.0-util.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@2.0-util.so
rename to src/system/lib64/arm64/android.hardware.audio.common@2.0-util.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@2.0.so b/src/system/lib64/arm64/android.hardware.audio.common@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@2.0.so
rename to src/system/lib64/arm64/android.hardware.audio.common@2.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@4.0-util.so b/src/system/lib64/arm64/android.hardware.audio.common@4.0-util.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@4.0-util.so
rename to src/system/lib64/arm64/android.hardware.audio.common@4.0-util.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@4.0.so b/src/system/lib64/arm64/android.hardware.audio.common@4.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@4.0.so
rename to src/system/lib64/arm64/android.hardware.audio.common@4.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@5.0-util.so b/src/system/lib64/arm64/android.hardware.audio.common@5.0-util.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@5.0-util.so
rename to src/system/lib64/arm64/android.hardware.audio.common@5.0-util.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@5.0.so b/src/system/lib64/arm64/android.hardware.audio.common@5.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@5.0.so
rename to src/system/lib64/arm64/android.hardware.audio.common@5.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@6.0-util.so b/src/system/lib64/arm64/android.hardware.audio.common@6.0-util.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@6.0-util.so
rename to src/system/lib64/arm64/android.hardware.audio.common@6.0-util.so
diff --git a/system/lib64/arm64/android.hardware.audio.common@6.0.so b/src/system/lib64/arm64/android.hardware.audio.common@6.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.common@6.0.so
rename to src/system/lib64/arm64/android.hardware.audio.common@6.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.effect@2.0.so b/src/system/lib64/arm64/android.hardware.audio.effect@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.effect@2.0.so
rename to src/system/lib64/arm64/android.hardware.audio.effect@2.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.effect@4.0.so b/src/system/lib64/arm64/android.hardware.audio.effect@4.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.effect@4.0.so
rename to src/system/lib64/arm64/android.hardware.audio.effect@4.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.effect@5.0.so b/src/system/lib64/arm64/android.hardware.audio.effect@5.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.effect@5.0.so
rename to src/system/lib64/arm64/android.hardware.audio.effect@5.0.so
diff --git a/system/lib64/arm64/android.hardware.audio.effect@6.0.so b/src/system/lib64/arm64/android.hardware.audio.effect@6.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio.effect@6.0.so
rename to src/system/lib64/arm64/android.hardware.audio.effect@6.0.so
diff --git a/system/lib64/arm64/android.hardware.audio@2.0.so b/src/system/lib64/arm64/android.hardware.audio@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio@2.0.so
rename to src/system/lib64/arm64/android.hardware.audio@2.0.so
diff --git a/system/lib64/arm64/android.hardware.audio@4.0.so b/src/system/lib64/arm64/android.hardware.audio@4.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio@4.0.so
rename to src/system/lib64/arm64/android.hardware.audio@4.0.so
diff --git a/system/lib64/arm64/android.hardware.audio@5.0.so b/src/system/lib64/arm64/android.hardware.audio@5.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio@5.0.so
rename to src/system/lib64/arm64/android.hardware.audio@5.0.so
diff --git a/system/lib64/arm64/android.hardware.audio@6.0.so b/src/system/lib64/arm64/android.hardware.audio@6.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.audio@6.0.so
rename to src/system/lib64/arm64/android.hardware.audio@6.0.so
diff --git a/system/lib64/arm64/android.hardware.cas.native@1.0.so b/src/system/lib64/arm64/android.hardware.cas.native@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.cas.native@1.0.so
rename to src/system/lib64/arm64/android.hardware.cas.native@1.0.so
diff --git a/system/lib64/arm64/android.hardware.cas@1.0.so b/src/system/lib64/arm64/android.hardware.cas@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.cas@1.0.so
rename to src/system/lib64/arm64/android.hardware.cas@1.0.so
diff --git a/system/lib64/arm64/android.hardware.common-V1-ndk_platform.so b/src/system/lib64/arm64/android.hardware.common-V1-ndk_platform.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.common-V1-ndk_platform.so
rename to src/system/lib64/arm64/android.hardware.common-V1-ndk_platform.so
diff --git a/system/lib64/arm64/android.hardware.configstore-utils.so b/src/system/lib64/arm64/android.hardware.configstore-utils.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.configstore-utils.so
rename to src/system/lib64/arm64/android.hardware.configstore-utils.so
diff --git a/system/lib64/arm64/android.hardware.configstore@1.0.so b/src/system/lib64/arm64/android.hardware.configstore@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.configstore@1.0.so
rename to src/system/lib64/arm64/android.hardware.configstore@1.0.so
diff --git a/system/lib64/arm64/android.hardware.configstore@1.1.so b/src/system/lib64/arm64/android.hardware.configstore@1.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.configstore@1.1.so
rename to src/system/lib64/arm64/android.hardware.configstore@1.1.so
diff --git a/system/lib64/arm64/android.hardware.drm@1.0.so b/src/system/lib64/arm64/android.hardware.drm@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.drm@1.0.so
rename to src/system/lib64/arm64/android.hardware.drm@1.0.so
diff --git a/system/lib64/arm64/android.hardware.drm@1.1.so b/src/system/lib64/arm64/android.hardware.drm@1.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.drm@1.1.so
rename to src/system/lib64/arm64/android.hardware.drm@1.1.so
diff --git a/system/lib64/arm64/android.hardware.drm@1.2.so b/src/system/lib64/arm64/android.hardware.drm@1.2.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.drm@1.2.so
rename to src/system/lib64/arm64/android.hardware.drm@1.2.so
diff --git a/system/lib64/arm64/android.hardware.drm@1.3.so b/src/system/lib64/arm64/android.hardware.drm@1.3.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.drm@1.3.so
rename to src/system/lib64/arm64/android.hardware.drm@1.3.so
diff --git a/system/lib64/arm64/android.hardware.graphics.allocator@2.0.so b/src/system/lib64/arm64/android.hardware.graphics.allocator@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.allocator@2.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.allocator@2.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.allocator@3.0.so b/src/system/lib64/arm64/android.hardware.graphics.allocator@3.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.allocator@3.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.allocator@3.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.allocator@4.0.so b/src/system/lib64/arm64/android.hardware.graphics.allocator@4.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.allocator@4.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.allocator@4.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.bufferqueue@1.0.so b/src/system/lib64/arm64/android.hardware.graphics.bufferqueue@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.bufferqueue@1.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.bufferqueue@1.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.bufferqueue@2.0.so b/src/system/lib64/arm64/android.hardware.graphics.bufferqueue@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.bufferqueue@2.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.bufferqueue@2.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.common-V1-ndk_platform.so b/src/system/lib64/arm64/android.hardware.graphics.common-V1-ndk_platform.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.common-V1-ndk_platform.so
rename to src/system/lib64/arm64/android.hardware.graphics.common-V1-ndk_platform.so
diff --git a/system/lib64/arm64/android.hardware.graphics.common@1.0.so b/src/system/lib64/arm64/android.hardware.graphics.common@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.common@1.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.common@1.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.common@1.1.so b/src/system/lib64/arm64/android.hardware.graphics.common@1.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.common@1.1.so
rename to src/system/lib64/arm64/android.hardware.graphics.common@1.1.so
diff --git a/system/lib64/arm64/android.hardware.graphics.common@1.2.so b/src/system/lib64/arm64/android.hardware.graphics.common@1.2.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.common@1.2.so
rename to src/system/lib64/arm64/android.hardware.graphics.common@1.2.so
diff --git a/system/lib64/arm64/android.hardware.graphics.composer@2.1.so b/src/system/lib64/arm64/android.hardware.graphics.composer@2.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.composer@2.1.so
rename to src/system/lib64/arm64/android.hardware.graphics.composer@2.1.so
diff --git a/system/lib64/arm64/android.hardware.graphics.composer@2.2.so b/src/system/lib64/arm64/android.hardware.graphics.composer@2.2.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.composer@2.2.so
rename to src/system/lib64/arm64/android.hardware.graphics.composer@2.2.so
diff --git a/system/lib64/arm64/android.hardware.graphics.composer@2.3.so b/src/system/lib64/arm64/android.hardware.graphics.composer@2.3.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.composer@2.3.so
rename to src/system/lib64/arm64/android.hardware.graphics.composer@2.3.so
diff --git a/system/lib64/arm64/android.hardware.graphics.composer@2.4.so b/src/system/lib64/arm64/android.hardware.graphics.composer@2.4.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.composer@2.4.so
rename to src/system/lib64/arm64/android.hardware.graphics.composer@2.4.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl-2.1.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl-2.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl-2.1.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl-2.1.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@2.0-impl.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@2.0.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@2.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@2.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@2.1.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@2.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@2.1.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@2.1.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@3.0-impl-ranchu.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@3.0-impl-ranchu.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@3.0-impl-ranchu.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@3.0-impl-ranchu.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@3.0.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@3.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@3.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@3.0.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm.so
diff --git a/system/lib64/arm64/android.hardware.graphics.mapper@4.0.so b/src/system/lib64/arm64/android.hardware.graphics.mapper@4.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.graphics.mapper@4.0.so
rename to src/system/lib64/arm64/android.hardware.graphics.mapper@4.0.so
diff --git a/system/lib64/arm64/android.hardware.media.bufferpool@2.0.so b/src/system/lib64/arm64/android.hardware.media.bufferpool@2.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.media.bufferpool@2.0.so
rename to src/system/lib64/arm64/android.hardware.media.bufferpool@2.0.so
diff --git a/system/lib64/arm64/android.hardware.media.c2@1.0.so b/src/system/lib64/arm64/android.hardware.media.c2@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.media.c2@1.0.so
rename to src/system/lib64/arm64/android.hardware.media.c2@1.0.so
diff --git a/system/lib64/arm64/android.hardware.media.c2@1.1.so b/src/system/lib64/arm64/android.hardware.media.c2@1.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.media.c2@1.1.so
rename to src/system/lib64/arm64/android.hardware.media.c2@1.1.so
diff --git a/system/lib64/arm64/android.hardware.media.omx@1.0.so b/src/system/lib64/arm64/android.hardware.media.omx@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.media.omx@1.0.so
rename to src/system/lib64/arm64/android.hardware.media.omx@1.0.so
diff --git a/system/lib64/arm64/android.hardware.media@1.0.so b/src/system/lib64/arm64/android.hardware.media@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.media@1.0.so
rename to src/system/lib64/arm64/android.hardware.media@1.0.so
diff --git a/system/lib64/arm64/android.hardware.memtrack@1.0.so b/src/system/lib64/arm64/android.hardware.memtrack@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.memtrack@1.0.so
rename to src/system/lib64/arm64/android.hardware.memtrack@1.0.so
diff --git a/system/lib64/arm64/android.hardware.power-V1-cpp.so b/src/system/lib64/arm64/android.hardware.power-V1-cpp.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.power-V1-cpp.so
rename to src/system/lib64/arm64/android.hardware.power-V1-cpp.so
diff --git a/system/lib64/arm64/android.hardware.power@1.0.so b/src/system/lib64/arm64/android.hardware.power@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.power@1.0.so
rename to src/system/lib64/arm64/android.hardware.power@1.0.so
diff --git a/system/lib64/arm64/android.hardware.power@1.1.so b/src/system/lib64/arm64/android.hardware.power@1.1.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.power@1.1.so
rename to src/system/lib64/arm64/android.hardware.power@1.1.so
diff --git a/system/lib64/arm64/android.hardware.power@1.2.so b/src/system/lib64/arm64/android.hardware.power@1.2.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.power@1.2.so
rename to src/system/lib64/arm64/android.hardware.power@1.2.so
diff --git a/system/lib64/arm64/android.hardware.power@1.3.so b/src/system/lib64/arm64/android.hardware.power@1.3.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.power@1.3.so
rename to src/system/lib64/arm64/android.hardware.power@1.3.so
diff --git a/system/lib64/arm64/android.hardware.renderscript@1.0.so b/src/system/lib64/arm64/android.hardware.renderscript@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hardware.renderscript@1.0.so
rename to src/system/lib64/arm64/android.hardware.renderscript@1.0.so
diff --git a/system/lib64/arm64/android.hidl.allocator@1.0.so b/src/system/lib64/arm64/android.hidl.allocator@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hidl.allocator@1.0.so
rename to src/system/lib64/arm64/android.hidl.allocator@1.0.so
diff --git a/system/lib64/arm64/android.hidl.memory.token@1.0.so b/src/system/lib64/arm64/android.hidl.memory.token@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hidl.memory.token@1.0.so
rename to src/system/lib64/arm64/android.hidl.memory.token@1.0.so
diff --git a/system/lib64/arm64/android.hidl.memory@1.0-impl.so b/src/system/lib64/arm64/android.hidl.memory@1.0-impl.so
similarity index 100%
rename from system/lib64/arm64/android.hidl.memory@1.0-impl.so
rename to src/system/lib64/arm64/android.hidl.memory@1.0-impl.so
diff --git a/system/lib64/arm64/android.hidl.memory@1.0.so b/src/system/lib64/arm64/android.hidl.memory@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hidl.memory@1.0.so
rename to src/system/lib64/arm64/android.hidl.memory@1.0.so
diff --git a/system/lib64/arm64/android.hidl.safe_union@1.0.so b/src/system/lib64/arm64/android.hidl.safe_union@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hidl.safe_union@1.0.so
rename to src/system/lib64/arm64/android.hidl.safe_union@1.0.so
diff --git a/system/lib64/arm64/android.hidl.token@1.0-utils.so b/src/system/lib64/arm64/android.hidl.token@1.0-utils.so
similarity index 100%
rename from system/lib64/arm64/android.hidl.token@1.0-utils.so
rename to src/system/lib64/arm64/android.hidl.token@1.0-utils.so
diff --git a/system/lib64/arm64/android.hidl.token@1.0.so b/src/system/lib64/arm64/android.hidl.token@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.hidl.token@1.0.so
rename to src/system/lib64/arm64/android.hidl.token@1.0.so
diff --git a/system/lib64/arm64/android.system.suspend@1.0.so b/src/system/lib64/arm64/android.system.suspend@1.0.so
similarity index 100%
rename from system/lib64/arm64/android.system.suspend@1.0.so
rename to src/system/lib64/arm64/android.system.suspend@1.0.so
diff --git a/system/lib64/arm64/capture_state_listener-aidl-V1-cpp.so b/src/system/lib64/arm64/capture_state_listener-aidl-V1-cpp.so
similarity index 100%
rename from system/lib64/arm64/capture_state_listener-aidl-V1-cpp.so
rename to src/system/lib64/arm64/capture_state_listener-aidl-V1-cpp.so
diff --git a/system/lib64/arm64/cpuinfo b/src/system/lib64/arm64/cpuinfo
similarity index 100%
rename from system/lib64/arm64/cpuinfo
rename to src/system/lib64/arm64/cpuinfo
diff --git a/system/lib64/arm64/gralloc.minigbm.so b/src/system/lib64/arm64/gralloc.minigbm.so
similarity index 100%
rename from system/lib64/arm64/gralloc.minigbm.so
rename to src/system/lib64/arm64/gralloc.minigbm.so
diff --git a/system/lib64/arm64/gralloc.ranchu.so b/src/system/lib64/arm64/gralloc.ranchu.so
similarity index 100%
rename from system/lib64/arm64/gralloc.ranchu.so
rename to src/system/lib64/arm64/gralloc.ranchu.so
diff --git a/system/lib64/arm64/ld-android.so b/src/system/lib64/arm64/ld-android.so
similarity index 100%
rename from system/lib64/arm64/ld-android.so
rename to src/system/lib64/arm64/ld-android.so
diff --git a/system/lib64/arm64/libEGL.so b/src/system/lib64/arm64/libEGL.so
similarity index 100%
rename from system/lib64/arm64/libEGL.so
rename to src/system/lib64/arm64/libEGL.so
diff --git a/system/lib64/arm64/libETC1.so b/src/system/lib64/arm64/libETC1.so
similarity index 100%
rename from system/lib64/arm64/libETC1.so
rename to src/system/lib64/arm64/libETC1.so
diff --git a/system/lib64/arm64/libGLESv1_CM.so b/src/system/lib64/arm64/libGLESv1_CM.so
similarity index 100%
rename from system/lib64/arm64/libGLESv1_CM.so
rename to src/system/lib64/arm64/libGLESv1_CM.so
diff --git a/system/lib64/arm64/libGLESv1_enc.so b/src/system/lib64/arm64/libGLESv1_enc.so
similarity index 100%
rename from system/lib64/arm64/libGLESv1_enc.so
rename to src/system/lib64/arm64/libGLESv1_enc.so
diff --git a/system/lib64/arm64/libGLESv2.so b/src/system/lib64/arm64/libGLESv2.so
similarity index 100%
rename from system/lib64/arm64/libGLESv2.so
rename to src/system/lib64/arm64/libGLESv2.so
diff --git a/system/lib64/arm64/libGLESv2_enc.so b/src/system/lib64/arm64/libGLESv2_enc.so
similarity index 100%
rename from system/lib64/arm64/libGLESv2_enc.so
rename to src/system/lib64/arm64/libGLESv2_enc.so
diff --git a/system/lib64/arm64/libGLESv3.so b/src/system/lib64/arm64/libGLESv3.so
similarity index 100%
rename from system/lib64/arm64/libGLESv3.so
rename to src/system/lib64/arm64/libGLESv3.so
diff --git a/system/lib64/arm64/libOpenMAXAL.so b/src/system/lib64/arm64/libOpenMAXAL.so
similarity index 100%
rename from system/lib64/arm64/libOpenMAXAL.so
rename to src/system/lib64/arm64/libOpenMAXAL.so
diff --git a/system/lib64/arm64/libOpenSLES.so b/src/system/lib64/arm64/libOpenSLES.so
similarity index 100%
rename from system/lib64/arm64/libOpenSLES.so
rename to src/system/lib64/arm64/libOpenSLES.so
diff --git a/system/lib64/arm64/libOpenglCodecCommon.so b/src/system/lib64/arm64/libOpenglCodecCommon.so
similarity index 100%
rename from system/lib64/arm64/libOpenglCodecCommon.so
rename to src/system/lib64/arm64/libOpenglCodecCommon.so
diff --git a/system/lib64/arm64/libOpenglSystemCommon.so b/src/system/lib64/arm64/libOpenglSystemCommon.so
similarity index 100%
rename from system/lib64/arm64/libOpenglSystemCommon.so
rename to src/system/lib64/arm64/libOpenglSystemCommon.so
diff --git a/system/lib64/arm64/libRS.so b/src/system/lib64/arm64/libRS.so
similarity index 100%
rename from system/lib64/arm64/libRS.so
rename to src/system/lib64/arm64/libRS.so
diff --git a/system/lib64/arm64/libRSCacheDir.so b/src/system/lib64/arm64/libRSCacheDir.so
similarity index 100%
rename from system/lib64/arm64/libRSCacheDir.so
rename to src/system/lib64/arm64/libRSCacheDir.so
diff --git a/system/lib64/arm64/libRSCpuRef.so b/src/system/lib64/arm64/libRSCpuRef.so
similarity index 100%
rename from system/lib64/arm64/libRSCpuRef.so
rename to src/system/lib64/arm64/libRSCpuRef.so
diff --git a/system/lib64/arm64/libRSDriver.so b/src/system/lib64/arm64/libRSDriver.so
similarity index 100%
rename from system/lib64/arm64/libRSDriver.so
rename to src/system/lib64/arm64/libRSDriver.so
diff --git a/system/lib64/arm64/libRS_internal.so b/src/system/lib64/arm64/libRS_internal.so
similarity index 100%
rename from system/lib64/arm64/libRS_internal.so
rename to src/system/lib64/arm64/libRS_internal.so
diff --git a/system/lib64/arm64/libRScpp.so b/src/system/lib64/arm64/libRScpp.so
similarity index 100%
rename from system/lib64/arm64/libRScpp.so
rename to src/system/lib64/arm64/libRScpp.so
diff --git a/system/lib64/arm64/libSurfaceFlingerProp.so b/src/system/lib64/arm64/libSurfaceFlingerProp.so
similarity index 100%
rename from system/lib64/arm64/libSurfaceFlingerProp.so
rename to src/system/lib64/arm64/libSurfaceFlingerProp.so
diff --git a/system/lib64/arm64/lib_renderControl_enc.so b/src/system/lib64/arm64/lib_renderControl_enc.so
similarity index 100%
rename from system/lib64/arm64/lib_renderControl_enc.so
rename to src/system/lib64/arm64/lib_renderControl_enc.so
diff --git a/system/lib64/arm64/libaaudio.so b/src/system/lib64/arm64/libaaudio.so
similarity index 100%
rename from system/lib64/arm64/libaaudio.so
rename to src/system/lib64/arm64/libaaudio.so
diff --git a/system/lib64/arm64/libaaudio_internal.so b/src/system/lib64/arm64/libaaudio_internal.so
similarity index 100%
rename from system/lib64/arm64/libaaudio_internal.so
rename to src/system/lib64/arm64/libaaudio_internal.so
diff --git a/system/lib64/arm64/libaeabi_map.so b/src/system/lib64/arm64/libaeabi_map.so
similarity index 100%
rename from system/lib64/arm64/libaeabi_map.so
rename to src/system/lib64/arm64/libaeabi_map.so
diff --git a/system/lib64/arm64/libamidi.so b/src/system/lib64/arm64/libamidi.so
similarity index 100%
rename from system/lib64/arm64/libamidi.so
rename to src/system/lib64/arm64/libamidi.so
diff --git a/system/lib64/arm64/libandroid.so b/src/system/lib64/arm64/libandroid.so
similarity index 100%
rename from system/lib64/arm64/libandroid.so
rename to src/system/lib64/arm64/libandroid.so
diff --git a/system/lib64/arm64/libandroid_net.so b/src/system/lib64/arm64/libandroid_net.so
similarity index 100%
rename from system/lib64/arm64/libandroid_net.so
rename to src/system/lib64/arm64/libandroid_net.so
diff --git a/system/lib64/arm64/libandroid_runtime.so b/src/system/lib64/arm64/libandroid_runtime.so
similarity index 100%
rename from system/lib64/arm64/libandroid_runtime.so
rename to src/system/lib64/arm64/libandroid_runtime.so
diff --git a/system/lib64/arm64/libandroid_runtime_lazy.so b/src/system/lib64/arm64/libandroid_runtime_lazy.so
similarity index 100%
rename from system/lib64/arm64/libandroid_runtime_lazy.so
rename to src/system/lib64/arm64/libandroid_runtime_lazy.so
diff --git a/system/lib64/arm64/libandroidemu.so b/src/system/lib64/arm64/libandroidemu.so
similarity index 100%
rename from system/lib64/arm64/libandroidemu.so
rename to src/system/lib64/arm64/libandroidemu.so
diff --git a/system/lib64/arm64/libandroidfw.so b/src/system/lib64/arm64/libandroidfw.so
similarity index 100%
rename from system/lib64/arm64/libandroidfw.so
rename to src/system/lib64/arm64/libandroidfw.so
diff --git a/system/lib64/arm64/libandroidicu.so b/src/system/lib64/arm64/libandroidicu.so
similarity index 100%
rename from system/lib64/arm64/libandroidicu.so
rename to src/system/lib64/arm64/libandroidicu.so
diff --git a/system/lib64/arm64/libappfuse.so b/src/system/lib64/arm64/libappfuse.so
similarity index 100%
rename from system/lib64/arm64/libappfuse.so
rename to src/system/lib64/arm64/libappfuse.so
diff --git a/system/lib64/arm64/libart.so b/src/system/lib64/arm64/libart.so
similarity index 100%
rename from system/lib64/arm64/libart.so
rename to src/system/lib64/arm64/libart.so
diff --git a/system/lib64/arm64/libartbase.so b/src/system/lib64/arm64/libartbase.so
similarity index 100%
rename from system/lib64/arm64/libartbase.so
rename to src/system/lib64/arm64/libartbase.so
diff --git a/system/lib64/arm64/libartpalette-system.so b/src/system/lib64/arm64/libartpalette-system.so
similarity index 100%
rename from system/lib64/arm64/libartpalette-system.so
rename to src/system/lib64/arm64/libartpalette-system.so
diff --git a/system/lib64/arm64/libartpalette.so b/src/system/lib64/arm64/libartpalette.so
similarity index 100%
rename from system/lib64/arm64/libartpalette.so
rename to src/system/lib64/arm64/libartpalette.so
diff --git a/system/lib64/arm64/libaudioclient.so b/src/system/lib64/arm64/libaudioclient.so
similarity index 100%
rename from system/lib64/arm64/libaudioclient.so
rename to src/system/lib64/arm64/libaudioclient.so
diff --git a/system/lib64/arm64/libaudioflinger.so b/src/system/lib64/arm64/libaudioflinger.so
similarity index 100%
rename from system/lib64/arm64/libaudioflinger.so
rename to src/system/lib64/arm64/libaudioflinger.so
diff --git a/system/lib64/arm64/libaudiofoundation.so b/src/system/lib64/arm64/libaudiofoundation.so
similarity index 100%
rename from system/lib64/arm64/libaudiofoundation.so
rename to src/system/lib64/arm64/libaudiofoundation.so
diff --git a/system/lib64/arm64/libaudiohal.so b/src/system/lib64/arm64/libaudiohal.so
similarity index 100%
rename from system/lib64/arm64/libaudiohal.so
rename to src/system/lib64/arm64/libaudiohal.so
diff --git a/system/lib64/arm64/libaudiohal@2.0.so b/src/system/lib64/arm64/libaudiohal@2.0.so
similarity index 100%
rename from system/lib64/arm64/libaudiohal@2.0.so
rename to src/system/lib64/arm64/libaudiohal@2.0.so
diff --git a/system/lib64/arm64/libaudiohal@4.0.so b/src/system/lib64/arm64/libaudiohal@4.0.so
similarity index 100%
rename from system/lib64/arm64/libaudiohal@4.0.so
rename to src/system/lib64/arm64/libaudiohal@4.0.so
diff --git a/system/lib64/arm64/libaudiohal@5.0.so b/src/system/lib64/arm64/libaudiohal@5.0.so
similarity index 100%
rename from system/lib64/arm64/libaudiohal@5.0.so
rename to src/system/lib64/arm64/libaudiohal@5.0.so
diff --git a/system/lib64/arm64/libaudiohal@6.0.so b/src/system/lib64/arm64/libaudiohal@6.0.so
similarity index 100%
rename from system/lib64/arm64/libaudiohal@6.0.so
rename to src/system/lib64/arm64/libaudiohal@6.0.so
diff --git a/system/lib64/arm64/libaudiohal_deathhandler.so b/src/system/lib64/arm64/libaudiohal_deathhandler.so
similarity index 100%
rename from system/lib64/arm64/libaudiohal_deathhandler.so
rename to src/system/lib64/arm64/libaudiohal_deathhandler.so
diff --git a/system/lib64/arm64/libaudiomanager.so b/src/system/lib64/arm64/libaudiomanager.so
similarity index 100%
rename from system/lib64/arm64/libaudiomanager.so
rename to src/system/lib64/arm64/libaudiomanager.so
diff --git a/system/lib64/arm64/libaudiopolicy.so b/src/system/lib64/arm64/libaudiopolicy.so
similarity index 100%
rename from system/lib64/arm64/libaudiopolicy.so
rename to src/system/lib64/arm64/libaudiopolicy.so
diff --git a/system/lib64/arm64/libaudioprocessing.so b/src/system/lib64/arm64/libaudioprocessing.so
similarity index 100%
rename from system/lib64/arm64/libaudioprocessing.so
rename to src/system/lib64/arm64/libaudioprocessing.so
diff --git a/system/lib64/arm64/libaudiospdif.so b/src/system/lib64/arm64/libaudiospdif.so
similarity index 100%
rename from system/lib64/arm64/libaudiospdif.so
rename to src/system/lib64/arm64/libaudiospdif.so
diff --git a/system/lib64/arm64/libaudioutils.so b/src/system/lib64/arm64/libaudioutils.so
similarity index 100%
rename from system/lib64/arm64/libaudioutils.so
rename to src/system/lib64/arm64/libaudioutils.so
diff --git a/system/lib64/arm64/libbacktrace.so b/src/system/lib64/arm64/libbacktrace.so
similarity index 100%
rename from system/lib64/arm64/libbacktrace.so
rename to src/system/lib64/arm64/libbacktrace.so
diff --git a/system/lib64/arm64/libbase.so b/src/system/lib64/arm64/libbase.so
similarity index 100%
rename from system/lib64/arm64/libbase.so
rename to src/system/lib64/arm64/libbase.so
diff --git a/system/lib64/arm64/libbcinfo.so b/src/system/lib64/arm64/libbcinfo.so
similarity index 100%
rename from system/lib64/arm64/libbcinfo.so
rename to src/system/lib64/arm64/libbcinfo.so
diff --git a/system/lib64/arm64/libbinder.so b/src/system/lib64/arm64/libbinder.so
similarity index 100%
rename from system/lib64/arm64/libbinder.so
rename to src/system/lib64/arm64/libbinder.so
diff --git a/system/lib64/arm64/libbinder_ndk.so b/src/system/lib64/arm64/libbinder_ndk.so
similarity index 100%
rename from system/lib64/arm64/libbinder_ndk.so
rename to src/system/lib64/arm64/libbinder_ndk.so
diff --git a/system/lib64/arm64/libblas.so b/src/system/lib64/arm64/libblas.so
similarity index 100%
rename from system/lib64/arm64/libblas.so
rename to src/system/lib64/arm64/libblas.so
diff --git a/system/lib64/arm64/libbpf.so b/src/system/lib64/arm64/libbpf.so
similarity index 100%
rename from system/lib64/arm64/libbpf.so
rename to src/system/lib64/arm64/libbpf.so
diff --git a/system/lib64/arm64/libbpf_android.so b/src/system/lib64/arm64/libbpf_android.so
similarity index 100%
rename from system/lib64/arm64/libbpf_android.so
rename to src/system/lib64/arm64/libbpf_android.so
diff --git a/system/lib64/arm64/libbufferhub.so b/src/system/lib64/arm64/libbufferhub.so
similarity index 100%
rename from system/lib64/arm64/libbufferhub.so
rename to src/system/lib64/arm64/libbufferhub.so
diff --git a/system/lib64/arm64/libbufferhubqueue.so b/src/system/lib64/arm64/libbufferhubqueue.so
similarity index 100%
rename from system/lib64/arm64/libbufferhubqueue.so
rename to src/system/lib64/arm64/libbufferhubqueue.so
diff --git a/system/lib64/arm64/libc++.so b/src/system/lib64/arm64/libc++.so
similarity index 100%
rename from system/lib64/arm64/libc++.so
rename to src/system/lib64/arm64/libc++.so
diff --git a/system/lib64/arm64/libc.so b/src/system/lib64/arm64/libc.so
similarity index 100%
rename from system/lib64/arm64/libc.so
rename to src/system/lib64/arm64/libc.so
diff --git a/system/lib64/arm64/libcamera2ndk.so b/src/system/lib64/arm64/libcamera2ndk.so
similarity index 100%
rename from system/lib64/arm64/libcamera2ndk.so
rename to src/system/lib64/arm64/libcamera2ndk.so
diff --git a/system/lib64/arm64/libcamera_client.so b/src/system/lib64/arm64/libcamera_client.so
similarity index 100%
rename from system/lib64/arm64/libcamera_client.so
rename to src/system/lib64/arm64/libcamera_client.so
diff --git a/system/lib64/arm64/libcamera_metadata.so b/src/system/lib64/arm64/libcamera_metadata.so
similarity index 100%
rename from system/lib64/arm64/libcamera_metadata.so
rename to src/system/lib64/arm64/libcamera_metadata.so
diff --git a/system/lib64/arm64/libcgrouprc.so b/src/system/lib64/arm64/libcgrouprc.so
similarity index 100%
rename from system/lib64/arm64/libcgrouprc.so
rename to src/system/lib64/arm64/libcgrouprc.so
diff --git a/system/lib64/arm64/libclcore.bc b/src/system/lib64/arm64/libclcore.bc
similarity index 100%
rename from system/lib64/arm64/libclcore.bc
rename to src/system/lib64/arm64/libclcore.bc
diff --git a/system/lib64/arm64/libclcore_debug.bc b/src/system/lib64/arm64/libclcore_debug.bc
similarity index 100%
rename from system/lib64/arm64/libclcore_debug.bc
rename to src/system/lib64/arm64/libclcore_debug.bc
diff --git a/system/lib64/arm64/libclcore_debug_g.bc b/src/system/lib64/arm64/libclcore_debug_g.bc
similarity index 100%
rename from system/lib64/arm64/libclcore_debug_g.bc
rename to src/system/lib64/arm64/libclcore_debug_g.bc
diff --git a/system/lib64/arm64/libclcore_g.bc b/src/system/lib64/arm64/libclcore_g.bc
similarity index 100%
rename from system/lib64/arm64/libclcore_g.bc
rename to src/system/lib64/arm64/libclcore_g.bc
diff --git a/system/lib64/arm64/libcodec2.so b/src/system/lib64/arm64/libcodec2.so
similarity index 100%
rename from system/lib64/arm64/libcodec2.so
rename to src/system/lib64/arm64/libcodec2.so
diff --git a/system/lib64/arm64/libcodec2_client.so b/src/system/lib64/arm64/libcodec2_client.so
similarity index 100%
rename from system/lib64/arm64/libcodec2_client.so
rename to src/system/lib64/arm64/libcodec2_client.so
diff --git a/system/lib64/arm64/libcodec2_hidl_client@1.0.so b/src/system/lib64/arm64/libcodec2_hidl_client@1.0.so
similarity index 100%
rename from system/lib64/arm64/libcodec2_hidl_client@1.0.so
rename to src/system/lib64/arm64/libcodec2_hidl_client@1.0.so
diff --git a/system/lib64/arm64/libcodec2_hidl_client@1.1.so b/src/system/lib64/arm64/libcodec2_hidl_client@1.1.so
similarity index 100%
rename from system/lib64/arm64/libcodec2_hidl_client@1.1.so
rename to src/system/lib64/arm64/libcodec2_hidl_client@1.1.so
diff --git a/system/lib64/arm64/libcodec2_vndk.so b/src/system/lib64/arm64/libcodec2_vndk.so
similarity index 100%
rename from system/lib64/arm64/libcodec2_vndk.so
rename to src/system/lib64/arm64/libcodec2_vndk.so
diff --git a/system/lib64/arm64/libcompiler_rt.so b/src/system/lib64/arm64/libcompiler_rt.so
similarity index 100%
rename from system/lib64/arm64/libcompiler_rt.so
rename to src/system/lib64/arm64/libcompiler_rt.so
diff --git a/system/lib64/arm64/libcrypto.so b/src/system/lib64/arm64/libcrypto.so
similarity index 100%
rename from system/lib64/arm64/libcrypto.so
rename to src/system/lib64/arm64/libcrypto.so
diff --git a/system/lib64/arm64/libcutils.so b/src/system/lib64/arm64/libcutils.so
similarity index 100%
rename from system/lib64/arm64/libcutils.so
rename to src/system/lib64/arm64/libcutils.so
diff --git a/system/lib64/arm64/libdataloader.so b/src/system/lib64/arm64/libdataloader.so
similarity index 100%
rename from system/lib64/arm64/libdataloader.so
rename to src/system/lib64/arm64/libdataloader.so
diff --git a/system/lib64/arm64/libdatasource.so b/src/system/lib64/arm64/libdatasource.so
similarity index 100%
rename from system/lib64/arm64/libdatasource.so
rename to src/system/lib64/arm64/libdatasource.so
diff --git a/system/lib64/arm64/libdebuggerd_client.so b/src/system/lib64/arm64/libdebuggerd_client.so
similarity index 100%
rename from system/lib64/arm64/libdebuggerd_client.so
rename to src/system/lib64/arm64/libdebuggerd_client.so
diff --git a/system/lib64/arm64/libdexfile.so b/src/system/lib64/arm64/libdexfile.so
similarity index 100%
rename from system/lib64/arm64/libdexfile.so
rename to src/system/lib64/arm64/libdexfile.so
diff --git a/system/lib64/arm64/libdexfile_external.so b/src/system/lib64/arm64/libdexfile_external.so
similarity index 100%
rename from system/lib64/arm64/libdexfile_external.so
rename to src/system/lib64/arm64/libdexfile_external.so
diff --git a/system/lib64/arm64/libdexfile_support.so b/src/system/lib64/arm64/libdexfile_support.so
similarity index 100%
rename from system/lib64/arm64/libdexfile_support.so
rename to src/system/lib64/arm64/libdexfile_support.so
diff --git a/system/lib64/arm64/libdl.so b/src/system/lib64/arm64/libdl.so
similarity index 100%
rename from system/lib64/arm64/libdl.so
rename to src/system/lib64/arm64/libdl.so
diff --git a/system/lib64/arm64/libdl_android.so b/src/system/lib64/arm64/libdl_android.so
similarity index 100%
rename from system/lib64/arm64/libdl_android.so
rename to src/system/lib64/arm64/libdl_android.so
diff --git a/system/lib64/arm64/libdng_sdk.so b/src/system/lib64/arm64/libdng_sdk.so
similarity index 100%
rename from system/lib64/arm64/libdng_sdk.so
rename to src/system/lib64/arm64/libdng_sdk.so
diff --git a/system/lib64/arm64/libdrm.so b/src/system/lib64/arm64/libdrm.so
similarity index 100%
rename from system/lib64/arm64/libdrm.so
rename to src/system/lib64/arm64/libdrm.so
diff --git a/system/lib64/arm64/libexpat.so b/src/system/lib64/arm64/libexpat.so
similarity index 100%
rename from system/lib64/arm64/libexpat.so
rename to src/system/lib64/arm64/libexpat.so
diff --git a/system/lib64/arm64/libfmq.so b/src/system/lib64/arm64/libfmq.so
similarity index 100%
rename from system/lib64/arm64/libfmq.so
rename to src/system/lib64/arm64/libfmq.so
diff --git a/system/lib64/arm64/libft2.so b/src/system/lib64/arm64/libft2.so
similarity index 100%
rename from system/lib64/arm64/libft2.so
rename to src/system/lib64/arm64/libft2.so
diff --git a/system/lib64/arm64/libgralloctypes.so b/src/system/lib64/arm64/libgralloctypes.so
similarity index 100%
rename from system/lib64/arm64/libgralloctypes.so
rename to src/system/lib64/arm64/libgralloctypes.so
diff --git a/system/lib64/arm64/libgraphicsenv.so b/src/system/lib64/arm64/libgraphicsenv.so
similarity index 100%
rename from system/lib64/arm64/libgraphicsenv.so
rename to src/system/lib64/arm64/libgraphicsenv.so
diff --git a/system/lib64/arm64/libgui.so b/src/system/lib64/arm64/libgui.so
similarity index 100%
rename from system/lib64/arm64/libgui.so
rename to src/system/lib64/arm64/libgui.so
diff --git a/system/lib64/arm64/libhardware.so b/src/system/lib64/arm64/libhardware.so
similarity index 100%
rename from system/lib64/arm64/libhardware.so
rename to src/system/lib64/arm64/libhardware.so
diff --git a/system/lib64/arm64/libhardware_legacy.so b/src/system/lib64/arm64/libhardware_legacy.so
similarity index 100%
rename from system/lib64/arm64/libhardware_legacy.so
rename to src/system/lib64/arm64/libhardware_legacy.so
diff --git a/system/lib64/arm64/libharfbuzz_ng.so b/src/system/lib64/arm64/libharfbuzz_ng.so
similarity index 100%
rename from system/lib64/arm64/libharfbuzz_ng.so
rename to src/system/lib64/arm64/libharfbuzz_ng.so
diff --git a/system/lib64/arm64/libheif.so b/src/system/lib64/arm64/libheif.so
similarity index 100%
rename from system/lib64/arm64/libheif.so
rename to src/system/lib64/arm64/libheif.so
diff --git a/system/lib64/arm64/libhidl-gen-utils.so b/src/system/lib64/arm64/libhidl-gen-utils.so
similarity index 100%
rename from system/lib64/arm64/libhidl-gen-utils.so
rename to src/system/lib64/arm64/libhidl-gen-utils.so
diff --git a/system/lib64/arm64/libhidlallocatorutils.so b/src/system/lib64/arm64/libhidlallocatorutils.so
similarity index 100%
rename from system/lib64/arm64/libhidlallocatorutils.so
rename to src/system/lib64/arm64/libhidlallocatorutils.so
diff --git a/system/lib64/arm64/libhidlbase.so b/src/system/lib64/arm64/libhidlbase.so
similarity index 100%
rename from system/lib64/arm64/libhidlbase.so
rename to src/system/lib64/arm64/libhidlbase.so
diff --git a/system/lib64/arm64/libhidlmemory.so b/src/system/lib64/arm64/libhidlmemory.so
similarity index 100%
rename from system/lib64/arm64/libhidlmemory.so
rename to src/system/lib64/arm64/libhidlmemory.so
diff --git a/system/lib64/arm64/libhwui.so b/src/system/lib64/arm64/libhwui.so
similarity index 100%
rename from system/lib64/arm64/libhwui.so
rename to src/system/lib64/arm64/libhwui.so
diff --git a/system/lib64/arm64/libicui18n.so b/src/system/lib64/arm64/libicui18n.so
similarity index 100%
rename from system/lib64/arm64/libicui18n.so
rename to src/system/lib64/arm64/libicui18n.so
diff --git a/system/lib64/arm64/libicuuc.so b/src/system/lib64/arm64/libicuuc.so
similarity index 100%
rename from system/lib64/arm64/libicuuc.so
rename to src/system/lib64/arm64/libicuuc.so
diff --git a/system/lib64/arm64/libimg_utils.so b/src/system/lib64/arm64/libimg_utils.so
similarity index 100%
rename from system/lib64/arm64/libimg_utils.so
rename to src/system/lib64/arm64/libimg_utils.so
diff --git a/system/lib64/arm64/libincfs.so b/src/system/lib64/arm64/libincfs.so
similarity index 100%
rename from system/lib64/arm64/libincfs.so
rename to src/system/lib64/arm64/libincfs.so
diff --git a/system/lib64/arm64/libinput.so b/src/system/lib64/arm64/libinput.so
similarity index 100%
rename from system/lib64/arm64/libinput.so
rename to src/system/lib64/arm64/libinput.so
diff --git a/system/lib64/arm64/libion.so b/src/system/lib64/arm64/libion.so
similarity index 100%
rename from system/lib64/arm64/libion.so
rename to src/system/lib64/arm64/libion.so
diff --git a/system/lib64/arm64/libjnigraphics.so b/src/system/lib64/arm64/libjnigraphics.so
similarity index 100%
rename from system/lib64/arm64/libjnigraphics.so
rename to src/system/lib64/arm64/libjnigraphics.so
diff --git a/system/lib64/arm64/libjpeg.so b/src/system/lib64/arm64/libjpeg.so
similarity index 100%
rename from system/lib64/arm64/libjpeg.so
rename to src/system/lib64/arm64/libjpeg.so
diff --git a/system/lib64/arm64/liblayers_proto.so b/src/system/lib64/arm64/liblayers_proto.so
similarity index 100%
rename from system/lib64/arm64/liblayers_proto.so
rename to src/system/lib64/arm64/liblayers_proto.so
diff --git a/system/lib64/arm64/liblog.so b/src/system/lib64/arm64/liblog.so
similarity index 100%
rename from system/lib64/arm64/liblog.so
rename to src/system/lib64/arm64/liblog.so
diff --git a/system/lib64/arm64/liblzma.so b/src/system/lib64/arm64/liblzma.so
similarity index 100%
rename from system/lib64/arm64/liblzma.so
rename to src/system/lib64/arm64/liblzma.so
diff --git a/system/lib64/arm64/libm.so b/src/system/lib64/arm64/libm.so
similarity index 100%
rename from system/lib64/arm64/libm.so
rename to src/system/lib64/arm64/libm.so
diff --git a/system/lib64/arm64/libmedia.so b/src/system/lib64/arm64/libmedia.so
similarity index 100%
rename from system/lib64/arm64/libmedia.so
rename to src/system/lib64/arm64/libmedia.so
diff --git a/system/lib64/arm64/libmedia_codeclist.so b/src/system/lib64/arm64/libmedia_codeclist.so
similarity index 100%
rename from system/lib64/arm64/libmedia_codeclist.so
rename to src/system/lib64/arm64/libmedia_codeclist.so
diff --git a/system/lib64/arm64/libmedia_helper.so b/src/system/lib64/arm64/libmedia_helper.so
similarity index 100%
rename from system/lib64/arm64/libmedia_helper.so
rename to src/system/lib64/arm64/libmedia_helper.so
diff --git a/system/lib64/arm64/libmedia_jni_utils.so b/src/system/lib64/arm64/libmedia_jni_utils.so
similarity index 100%
rename from system/lib64/arm64/libmedia_jni_utils.so
rename to src/system/lib64/arm64/libmedia_jni_utils.so
diff --git a/system/lib64/arm64/libmedia_omx.so b/src/system/lib64/arm64/libmedia_omx.so
similarity index 100%
rename from system/lib64/arm64/libmedia_omx.so
rename to src/system/lib64/arm64/libmedia_omx.so
diff --git a/system/lib64/arm64/libmedia_omx_client.so b/src/system/lib64/arm64/libmedia_omx_client.so
similarity index 100%
rename from system/lib64/arm64/libmedia_omx_client.so
rename to src/system/lib64/arm64/libmedia_omx_client.so
diff --git a/system/lib64/arm64/libmediadrm.so b/src/system/lib64/arm64/libmediadrm.so
similarity index 100%
rename from system/lib64/arm64/libmediadrm.so
rename to src/system/lib64/arm64/libmediadrm.so
diff --git a/system/lib64/arm64/libmediadrmmetrics_lite.so b/src/system/lib64/arm64/libmediadrmmetrics_lite.so
similarity index 100%
rename from system/lib64/arm64/libmediadrmmetrics_lite.so
rename to src/system/lib64/arm64/libmediadrmmetrics_lite.so
diff --git a/system/lib64/arm64/libmedialogservice.so b/src/system/lib64/arm64/libmedialogservice.so
similarity index 100%
rename from system/lib64/arm64/libmedialogservice.so
rename to src/system/lib64/arm64/libmedialogservice.so
diff --git a/system/lib64/arm64/libmediametrics.so b/src/system/lib64/arm64/libmediametrics.so
similarity index 100%
rename from system/lib64/arm64/libmediametrics.so
rename to src/system/lib64/arm64/libmediametrics.so
diff --git a/system/lib64/arm64/libmediandk.so b/src/system/lib64/arm64/libmediandk.so
similarity index 100%
rename from system/lib64/arm64/libmediandk.so
rename to src/system/lib64/arm64/libmediandk.so
diff --git a/system/lib64/arm64/libmediandk_utils.so b/src/system/lib64/arm64/libmediandk_utils.so
similarity index 100%
rename from system/lib64/arm64/libmediandk_utils.so
rename to src/system/lib64/arm64/libmediandk_utils.so
diff --git a/system/lib64/arm64/libmediautils.so b/src/system/lib64/arm64/libmediautils.so
similarity index 100%
rename from system/lib64/arm64/libmediautils.so
rename to src/system/lib64/arm64/libmediautils.so
diff --git a/system/lib64/arm64/libmeminfo.so b/src/system/lib64/arm64/libmeminfo.so
similarity index 100%
rename from system/lib64/arm64/libmeminfo.so
rename to src/system/lib64/arm64/libmeminfo.so
diff --git a/system/lib64/arm64/libmemtrack.so b/src/system/lib64/arm64/libmemtrack.so
similarity index 100%
rename from system/lib64/arm64/libmemtrack.so
rename to src/system/lib64/arm64/libmemtrack.so
diff --git a/system/lib64/arm64/libmemunreachable.so b/src/system/lib64/arm64/libmemunreachable.so
similarity index 100%
rename from system/lib64/arm64/libmemunreachable.so
rename to src/system/lib64/arm64/libmemunreachable.so
diff --git a/system/lib64/arm64/libminigbm_gralloc_arcvm.so b/src/system/lib64/arm64/libminigbm_gralloc_arcvm.so
similarity index 100%
rename from system/lib64/arm64/libminigbm_gralloc_arcvm.so
rename to src/system/lib64/arm64/libminigbm_gralloc_arcvm.so
diff --git a/system/lib64/arm64/libminikin.so b/src/system/lib64/arm64/libminikin.so
similarity index 100%
rename from system/lib64/arm64/libminikin.so
rename to src/system/lib64/arm64/libminikin.so
diff --git a/system/lib64/arm64/libnativebridge.so b/src/system/lib64/arm64/libnativebridge.so
similarity index 100%
rename from system/lib64/arm64/libnativebridge.so
rename to src/system/lib64/arm64/libnativebridge.so
diff --git a/system/lib64/arm64/libnativebridge_lazy.so b/src/system/lib64/arm64/libnativebridge_lazy.so
similarity index 100%
rename from system/lib64/arm64/libnativebridge_lazy.so
rename to src/system/lib64/arm64/libnativebridge_lazy.so
diff --git a/system/lib64/arm64/libnativedisplay.so b/src/system/lib64/arm64/libnativedisplay.so
similarity index 100%
rename from system/lib64/arm64/libnativedisplay.so
rename to src/system/lib64/arm64/libnativedisplay.so
diff --git a/system/lib64/arm64/libnativehelper.so b/src/system/lib64/arm64/libnativehelper.so
similarity index 100%
rename from system/lib64/arm64/libnativehelper.so
rename to src/system/lib64/arm64/libnativehelper.so
diff --git a/system/lib64/arm64/libnativeloader.so b/src/system/lib64/arm64/libnativeloader.so
similarity index 100%
rename from system/lib64/arm64/libnativeloader.so
rename to src/system/lib64/arm64/libnativeloader.so
diff --git a/system/lib64/arm64/libnativeloader_lazy.so b/src/system/lib64/arm64/libnativeloader_lazy.so
similarity index 100%
rename from system/lib64/arm64/libnativeloader_lazy.so
rename to src/system/lib64/arm64/libnativeloader_lazy.so
diff --git a/system/lib64/arm64/libnativewindow.so b/src/system/lib64/arm64/libnativewindow.so
similarity index 100%
rename from system/lib64/arm64/libnativewindow.so
rename to src/system/lib64/arm64/libnativewindow.so
diff --git a/system/lib64/arm64/libnbaio.so b/src/system/lib64/arm64/libnbaio.so
similarity index 100%
rename from system/lib64/arm64/libnbaio.so
rename to src/system/lib64/arm64/libnbaio.so
diff --git a/system/lib64/arm64/libnblog.so b/src/system/lib64/arm64/libnblog.so
similarity index 100%
rename from system/lib64/arm64/libnblog.so
rename to src/system/lib64/arm64/libnblog.so
diff --git a/system/lib64/arm64/libnetd_client.so b/src/system/lib64/arm64/libnetd_client.so
similarity index 100%
rename from system/lib64/arm64/libnetd_client.so
rename to src/system/lib64/arm64/libnetd_client.so
diff --git a/system/lib64/arm64/libnetdbpf.so b/src/system/lib64/arm64/libnetdbpf.so
similarity index 100%
rename from system/lib64/arm64/libnetdbpf.so
rename to src/system/lib64/arm64/libnetdbpf.so
diff --git a/system/lib64/arm64/libnetdutils.so b/src/system/lib64/arm64/libnetdutils.so
similarity index 100%
rename from system/lib64/arm64/libnetdutils.so
rename to src/system/lib64/arm64/libnetdutils.so
diff --git a/system/lib64/arm64/libneuralnetworks.so b/src/system/lib64/arm64/libneuralnetworks.so
similarity index 100%
rename from system/lib64/arm64/libneuralnetworks.so
rename to src/system/lib64/arm64/libneuralnetworks.so
diff --git a/system/lib64/arm64/libneuralnetworks_packageinfo.so b/src/system/lib64/arm64/libneuralnetworks_packageinfo.so
similarity index 100%
rename from system/lib64/arm64/libneuralnetworks_packageinfo.so
rename to src/system/lib64/arm64/libneuralnetworks_packageinfo.so
diff --git a/system/lib64/arm64/libpackagelistparser.so b/src/system/lib64/arm64/libpackagelistparser.so
similarity index 100%
rename from system/lib64/arm64/libpackagelistparser.so
rename to src/system/lib64/arm64/libpackagelistparser.so
diff --git a/system/lib64/arm64/libpcre2.so b/src/system/lib64/arm64/libpcre2.so
similarity index 100%
rename from system/lib64/arm64/libpcre2.so
rename to src/system/lib64/arm64/libpcre2.so
diff --git a/system/lib64/arm64/libpdfium.so b/src/system/lib64/arm64/libpdfium.so
similarity index 100%
rename from system/lib64/arm64/libpdfium.so
rename to src/system/lib64/arm64/libpdfium.so
diff --git a/system/lib64/arm64/libpdx_default_transport.so b/src/system/lib64/arm64/libpdx_default_transport.so
similarity index 100%
rename from system/lib64/arm64/libpdx_default_transport.so
rename to src/system/lib64/arm64/libpdx_default_transport.so
diff --git a/system/lib64/arm64/libpiex.so b/src/system/lib64/arm64/libpiex.so
similarity index 100%
rename from system/lib64/arm64/libpiex.so
rename to src/system/lib64/arm64/libpiex.so
diff --git a/system/lib64/arm64/libpng.so b/src/system/lib64/arm64/libpng.so
similarity index 100%
rename from system/lib64/arm64/libpng.so
rename to src/system/lib64/arm64/libpng.so
diff --git a/system/lib64/arm64/libpowermanager.so b/src/system/lib64/arm64/libpowermanager.so
similarity index 100%
rename from system/lib64/arm64/libpowermanager.so
rename to src/system/lib64/arm64/libpowermanager.so
diff --git a/system/lib64/arm64/libprocessgroup.so b/src/system/lib64/arm64/libprocessgroup.so
similarity index 100%
rename from system/lib64/arm64/libprocessgroup.so
rename to src/system/lib64/arm64/libprocessgroup.so
diff --git a/system/lib64/arm64/libprocinfo.so b/src/system/lib64/arm64/libprocinfo.so
similarity index 100%
rename from system/lib64/arm64/libprocinfo.so
rename to src/system/lib64/arm64/libprocinfo.so
diff --git a/system/lib64/arm64/libprofile.so b/src/system/lib64/arm64/libprofile.so
similarity index 100%
rename from system/lib64/arm64/libprofile.so
rename to src/system/lib64/arm64/libprofile.so
diff --git a/system/lib64/arm64/libprotobuf-cpp-lite.so b/src/system/lib64/arm64/libprotobuf-cpp-lite.so
similarity index 100%
rename from system/lib64/arm64/libprotobuf-cpp-lite.so
rename to src/system/lib64/arm64/libprotobuf-cpp-lite.so
diff --git a/system/lib64/arm64/libprotoutil.so b/src/system/lib64/arm64/libprotoutil.so
similarity index 100%
rename from system/lib64/arm64/libprotoutil.so
rename to src/system/lib64/arm64/libprotoutil.so
diff --git a/system/lib64/arm64/libselinux.so b/src/system/lib64/arm64/libselinux.so
similarity index 100%
rename from system/lib64/arm64/libselinux.so
rename to src/system/lib64/arm64/libselinux.so
diff --git a/system/lib64/arm64/libsensor.so b/src/system/lib64/arm64/libsensor.so
similarity index 100%
rename from system/lib64/arm64/libsensor.so
rename to src/system/lib64/arm64/libsensor.so
diff --git a/system/lib64/arm64/libsfplugin_ccodec.so b/src/system/lib64/arm64/libsfplugin_ccodec.so
similarity index 100%
rename from system/lib64/arm64/libsfplugin_ccodec.so
rename to src/system/lib64/arm64/libsfplugin_ccodec.so
diff --git a/system/lib64/arm64/libsfplugin_ccodec_utils.so b/src/system/lib64/arm64/libsfplugin_ccodec_utils.so
similarity index 100%
rename from system/lib64/arm64/libsfplugin_ccodec_utils.so
rename to src/system/lib64/arm64/libsfplugin_ccodec_utils.so
diff --git a/system/lib64/arm64/libsigchain.so b/src/system/lib64/arm64/libsigchain.so
similarity index 100%
rename from system/lib64/arm64/libsigchain.so
rename to src/system/lib64/arm64/libsigchain.so
diff --git a/system/lib64/arm64/libsonic.so b/src/system/lib64/arm64/libsonic.so
similarity index 100%
rename from system/lib64/arm64/libsonic.so
rename to src/system/lib64/arm64/libsonic.so
diff --git a/system/lib64/arm64/libspeexresampler.so b/src/system/lib64/arm64/libspeexresampler.so
similarity index 100%
rename from system/lib64/arm64/libspeexresampler.so
rename to src/system/lib64/arm64/libspeexresampler.so
diff --git a/system/lib64/arm64/libsqlite.so b/src/system/lib64/arm64/libsqlite.so
similarity index 100%
rename from system/lib64/arm64/libsqlite.so
rename to src/system/lib64/arm64/libsqlite.so
diff --git a/system/lib64/arm64/libssl.so b/src/system/lib64/arm64/libssl.so
similarity index 100%
rename from system/lib64/arm64/libssl.so
rename to src/system/lib64/arm64/libssl.so
diff --git a/system/lib64/arm64/libstagefright.so b/src/system/lib64/arm64/libstagefright.so
similarity index 100%
rename from system/lib64/arm64/libstagefright.so
rename to src/system/lib64/arm64/libstagefright.so
diff --git a/system/lib64/arm64/libstagefright_bufferpool@2.0.1.so b/src/system/lib64/arm64/libstagefright_bufferpool@2.0.1.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_bufferpool@2.0.1.so
rename to src/system/lib64/arm64/libstagefright_bufferpool@2.0.1.so
diff --git a/system/lib64/arm64/libstagefright_bufferqueue_helper.so b/src/system/lib64/arm64/libstagefright_bufferqueue_helper.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_bufferqueue_helper.so
rename to src/system/lib64/arm64/libstagefright_bufferqueue_helper.so
diff --git a/system/lib64/arm64/libstagefright_codecbase.so b/src/system/lib64/arm64/libstagefright_codecbase.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_codecbase.so
rename to src/system/lib64/arm64/libstagefright_codecbase.so
diff --git a/system/lib64/arm64/libstagefright_foundation.so b/src/system/lib64/arm64/libstagefright_foundation.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_foundation.so
rename to src/system/lib64/arm64/libstagefright_foundation.so
diff --git a/system/lib64/arm64/libstagefright_framecapture_utils.so b/src/system/lib64/arm64/libstagefright_framecapture_utils.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_framecapture_utils.so
rename to src/system/lib64/arm64/libstagefright_framecapture_utils.so
diff --git a/system/lib64/arm64/libstagefright_http_support.so b/src/system/lib64/arm64/libstagefright_http_support.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_http_support.so
rename to src/system/lib64/arm64/libstagefright_http_support.so
diff --git a/system/lib64/arm64/libstagefright_omx.so b/src/system/lib64/arm64/libstagefright_omx.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_omx.so
rename to src/system/lib64/arm64/libstagefright_omx.so
diff --git a/system/lib64/arm64/libstagefright_omx_utils.so b/src/system/lib64/arm64/libstagefright_omx_utils.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_omx_utils.so
rename to src/system/lib64/arm64/libstagefright_omx_utils.so
diff --git a/system/lib64/arm64/libstagefright_xmlparser.so b/src/system/lib64/arm64/libstagefright_xmlparser.so
similarity index 100%
rename from system/lib64/arm64/libstagefright_xmlparser.so
rename to src/system/lib64/arm64/libstagefright_xmlparser.so
diff --git a/system/lib64/arm64/libstatslog.so b/src/system/lib64/arm64/libstatslog.so
similarity index 100%
rename from system/lib64/arm64/libstatslog.so
rename to src/system/lib64/arm64/libstatslog.so
diff --git a/system/lib64/arm64/libstatspull.so b/src/system/lib64/arm64/libstatspull.so
similarity index 100%
rename from system/lib64/arm64/libstatspull.so
rename to src/system/lib64/arm64/libstatspull.so
diff --git a/system/lib64/arm64/libstatssocket.so b/src/system/lib64/arm64/libstatssocket.so
similarity index 100%
rename from system/lib64/arm64/libstatssocket.so
rename to src/system/lib64/arm64/libstatssocket.so
diff --git a/system/lib64/arm64/libstdc++.so b/src/system/lib64/arm64/libstdc++.so
similarity index 100%
rename from system/lib64/arm64/libstdc++.so
rename to src/system/lib64/arm64/libstdc++.so
diff --git a/system/lib64/arm64/libsurfaceflinger.so b/src/system/lib64/arm64/libsurfaceflinger.so
similarity index 100%
rename from system/lib64/arm64/libsurfaceflinger.so
rename to src/system/lib64/arm64/libsurfaceflinger.so
diff --git a/system/lib64/arm64/libsync.so b/src/system/lib64/arm64/libsync.so
similarity index 100%
rename from system/lib64/arm64/libsync.so
rename to src/system/lib64/arm64/libsync.so
diff --git a/system/lib64/arm64/libtimeinstate.so b/src/system/lib64/arm64/libtimeinstate.so
similarity index 100%
rename from system/lib64/arm64/libtimeinstate.so
rename to src/system/lib64/arm64/libtimeinstate.so
diff --git a/system/lib64/arm64/libtimestats.so b/src/system/lib64/arm64/libtimestats.so
similarity index 100%
rename from system/lib64/arm64/libtimestats.so
rename to src/system/lib64/arm64/libtimestats.so
diff --git a/system/lib64/arm64/libtimestats_proto.so b/src/system/lib64/arm64/libtimestats_proto.so
similarity index 100%
rename from system/lib64/arm64/libtimestats_proto.so
rename to src/system/lib64/arm64/libtimestats_proto.so
diff --git a/system/lib64/arm64/libtinyxml2.so b/src/system/lib64/arm64/libtinyxml2.so
similarity index 100%
rename from system/lib64/arm64/libtinyxml2.so
rename to src/system/lib64/arm64/libtinyxml2.so
diff --git a/system/lib64/arm64/libtombstoned_client.so b/src/system/lib64/arm64/libtombstoned_client.so
similarity index 100%
rename from system/lib64/arm64/libtombstoned_client.so
rename to src/system/lib64/arm64/libtombstoned_client.so
diff --git a/system/lib64/arm64/libui.so b/src/system/lib64/arm64/libui.so
similarity index 100%
rename from system/lib64/arm64/libui.so
rename to src/system/lib64/arm64/libui.so
diff --git a/system/lib64/arm64/libunwindstack.so b/src/system/lib64/arm64/libunwindstack.so
similarity index 100%
rename from system/lib64/arm64/libunwindstack.so
rename to src/system/lib64/arm64/libunwindstack.so
diff --git a/system/lib64/arm64/libusbhost.so b/src/system/lib64/arm64/libusbhost.so
similarity index 100%
rename from system/lib64/arm64/libusbhost.so
rename to src/system/lib64/arm64/libusbhost.so
diff --git a/system/lib64/arm64/libutils.so b/src/system/lib64/arm64/libutils.so
similarity index 100%
rename from system/lib64/arm64/libutils.so
rename to src/system/lib64/arm64/libutils.so
diff --git a/system/lib64/arm64/libutilscallstack.so b/src/system/lib64/arm64/libutilscallstack.so
similarity index 100%
rename from system/lib64/arm64/libutilscallstack.so
rename to src/system/lib64/arm64/libutilscallstack.so
diff --git a/system/lib64/arm64/libvibrator.so b/src/system/lib64/arm64/libvibrator.so
similarity index 100%
rename from system/lib64/arm64/libvibrator.so
rename to src/system/lib64/arm64/libvibrator.so
diff --git a/system/lib64/arm64/libvintf.so b/src/system/lib64/arm64/libvintf.so
similarity index 100%
rename from system/lib64/arm64/libvintf.so
rename to src/system/lib64/arm64/libvintf.so
diff --git a/system/lib64/arm64/libvndksupport.so b/src/system/lib64/arm64/libvndksupport.so
similarity index 100%
rename from system/lib64/arm64/libvndksupport.so
rename to src/system/lib64/arm64/libvndksupport.so
diff --git a/system/lib64/arm64/libvulkan.so b/src/system/lib64/arm64/libvulkan.so
similarity index 100%
rename from system/lib64/arm64/libvulkan.so
rename to src/system/lib64/arm64/libvulkan.so
diff --git a/system/lib64/arm64/libvulkan_enc.so b/src/system/lib64/arm64/libvulkan_enc.so
similarity index 100%
rename from system/lib64/arm64/libvulkan_enc.so
rename to src/system/lib64/arm64/libvulkan_enc.so
diff --git a/system/lib64/arm64/libwebviewchromium_plat_support.so b/src/system/lib64/arm64/libwebviewchromium_plat_support.so
similarity index 100%
rename from system/lib64/arm64/libwebviewchromium_plat_support.so
rename to src/system/lib64/arm64/libwebviewchromium_plat_support.so
diff --git a/system/lib64/arm64/libwilhelm.so b/src/system/lib64/arm64/libwilhelm.so
similarity index 100%
rename from system/lib64/arm64/libwilhelm.so
rename to src/system/lib64/arm64/libwilhelm.so
diff --git a/system/lib64/arm64/libxml2.so b/src/system/lib64/arm64/libxml2.so
similarity index 100%
rename from system/lib64/arm64/libxml2.so
rename to src/system/lib64/arm64/libxml2.so
diff --git a/system/lib64/arm64/libz.so b/src/system/lib64/arm64/libz.so
similarity index 100%
rename from system/lib64/arm64/libz.so
rename to src/system/lib64/arm64/libz.so
diff --git a/system/lib64/arm64/libziparchive.so b/src/system/lib64/arm64/libziparchive.so
similarity index 100%
rename from system/lib64/arm64/libziparchive.so
rename to src/system/lib64/arm64/libziparchive.so
diff --git a/system/lib64/arm64/nb/ld-android.so b/src/system/lib64/arm64/nb/ld-android.so
similarity index 100%
rename from system/lib64/arm64/nb/ld-android.so
rename to src/system/lib64/arm64/nb/ld-android.so
diff --git a/system/lib64/arm64/nb/libEGL.so b/src/system/lib64/arm64/nb/libEGL.so
similarity index 100%
rename from system/lib64/arm64/nb/libEGL.so
rename to src/system/lib64/arm64/nb/libEGL.so
diff --git a/system/lib64/arm64/nb/libGLESv1_CM.so b/src/system/lib64/arm64/nb/libGLESv1_CM.so
similarity index 100%
rename from system/lib64/arm64/nb/libGLESv1_CM.so
rename to src/system/lib64/arm64/nb/libGLESv1_CM.so
diff --git a/system/lib64/arm64/nb/libGLESv2.so b/src/system/lib64/arm64/nb/libGLESv2.so
similarity index 100%
rename from system/lib64/arm64/nb/libGLESv2.so
rename to src/system/lib64/arm64/nb/libGLESv2.so
diff --git a/system/lib64/arm64/nb/libGLESv3.so b/src/system/lib64/arm64/nb/libGLESv3.so
similarity index 100%
rename from system/lib64/arm64/nb/libGLESv3.so
rename to src/system/lib64/arm64/nb/libGLESv3.so
diff --git a/system/lib64/arm64/nb/libOpenMAXAL.so b/src/system/lib64/arm64/nb/libOpenMAXAL.so
similarity index 100%
rename from system/lib64/arm64/nb/libOpenMAXAL.so
rename to src/system/lib64/arm64/nb/libOpenMAXAL.so
diff --git a/system/lib64/arm64/nb/libOpenSLES.so b/src/system/lib64/arm64/nb/libOpenSLES.so
similarity index 100%
rename from system/lib64/arm64/nb/libOpenSLES.so
rename to src/system/lib64/arm64/nb/libOpenSLES.so
diff --git a/system/lib64/arm64/nb/libRS.so b/src/system/lib64/arm64/nb/libRS.so
similarity index 100%
rename from system/lib64/arm64/nb/libRS.so
rename to src/system/lib64/arm64/nb/libRS.so
diff --git a/system/lib64/arm64/nb/libaaudio.so b/src/system/lib64/arm64/nb/libaaudio.so
similarity index 100%
rename from system/lib64/arm64/nb/libaaudio.so
rename to src/system/lib64/arm64/nb/libaaudio.so
diff --git a/system/lib64/arm64/nb/libamidi.so b/src/system/lib64/arm64/nb/libamidi.so
similarity index 100%
rename from system/lib64/arm64/nb/libamidi.so
rename to src/system/lib64/arm64/nb/libamidi.so
diff --git a/system/lib64/arm64/nb/libandroid.so b/src/system/lib64/arm64/nb/libandroid.so
similarity index 100%
rename from system/lib64/arm64/nb/libandroid.so
rename to src/system/lib64/arm64/nb/libandroid.so
diff --git a/system/lib64/arm64/nb/libandroid_net.so b/src/system/lib64/arm64/nb/libandroid_net.so
similarity index 100%
rename from system/lib64/arm64/nb/libandroid_net.so
rename to src/system/lib64/arm64/nb/libandroid_net.so
diff --git a/system/lib64/arm64/nb/libandroid_runtime.so b/src/system/lib64/arm64/nb/libandroid_runtime.so
similarity index 100%
rename from system/lib64/arm64/nb/libandroid_runtime.so
rename to src/system/lib64/arm64/nb/libandroid_runtime.so
diff --git a/system/lib64/arm64/nb/libandroid_runtime_lazy.so b/src/system/lib64/arm64/nb/libandroid_runtime_lazy.so
similarity index 100%
rename from system/lib64/arm64/nb/libandroid_runtime_lazy.so
rename to src/system/lib64/arm64/nb/libandroid_runtime_lazy.so
diff --git a/system/lib64/arm64/nb/libart.so b/src/system/lib64/arm64/nb/libart.so
similarity index 100%
rename from system/lib64/arm64/nb/libart.so
rename to src/system/lib64/arm64/nb/libart.so
diff --git a/system/lib64/arm64/nb/libaudioflinger.so b/src/system/lib64/arm64/nb/libaudioflinger.so
similarity index 100%
rename from system/lib64/arm64/nb/libaudioflinger.so
rename to src/system/lib64/arm64/nb/libaudioflinger.so
diff --git a/system/lib64/arm64/nb/libbinder.so b/src/system/lib64/arm64/nb/libbinder.so
similarity index 100%
rename from system/lib64/arm64/nb/libbinder.so
rename to src/system/lib64/arm64/nb/libbinder.so
diff --git a/system/lib64/arm64/nb/libbinder_ndk.so b/src/system/lib64/arm64/nb/libbinder_ndk.so
similarity index 100%
rename from system/lib64/arm64/nb/libbinder_ndk.so
rename to src/system/lib64/arm64/nb/libbinder_ndk.so
diff --git a/system/lib64/arm64/nb/libc.so b/src/system/lib64/arm64/nb/libc.so
similarity index 100%
rename from system/lib64/arm64/nb/libc.so
rename to src/system/lib64/arm64/nb/libc.so
diff --git a/system/lib64/arm64/nb/libcamera2ndk.so b/src/system/lib64/arm64/nb/libcamera2ndk.so
similarity index 100%
rename from system/lib64/arm64/nb/libcamera2ndk.so
rename to src/system/lib64/arm64/nb/libcamera2ndk.so
diff --git a/system/lib64/arm64/nb/libcamera_client.so b/src/system/lib64/arm64/nb/libcamera_client.so
similarity index 100%
rename from system/lib64/arm64/nb/libcamera_client.so
rename to src/system/lib64/arm64/nb/libcamera_client.so
diff --git a/system/lib64/arm64/nb/libcgrouprc.so b/src/system/lib64/arm64/nb/libcgrouprc.so
similarity index 100%
rename from system/lib64/arm64/nb/libcgrouprc.so
rename to src/system/lib64/arm64/nb/libcgrouprc.so
diff --git a/system/lib64/arm64/nb/libcrypto.so b/src/system/lib64/arm64/nb/libcrypto.so
similarity index 100%
rename from system/lib64/arm64/nb/libcrypto.so
rename to src/system/lib64/arm64/nb/libcrypto.so
diff --git a/system/lib64/arm64/nb/libcutils.so b/src/system/lib64/arm64/nb/libcutils.so
similarity index 100%
rename from system/lib64/arm64/nb/libcutils.so
rename to src/system/lib64/arm64/nb/libcutils.so
diff --git a/system/lib64/arm64/nb/libdl.so b/src/system/lib64/arm64/nb/libdl.so
similarity index 100%
rename from system/lib64/arm64/nb/libdl.so
rename to src/system/lib64/arm64/nb/libdl.so
diff --git a/system/lib64/arm64/nb/libdl_android.so b/src/system/lib64/arm64/nb/libdl_android.so
similarity index 100%
rename from system/lib64/arm64/nb/libdl_android.so
rename to src/system/lib64/arm64/nb/libdl_android.so
diff --git a/system/lib64/arm64/nb/libexpat.so b/src/system/lib64/arm64/nb/libexpat.so
similarity index 100%
rename from system/lib64/arm64/nb/libexpat.so
rename to src/system/lib64/arm64/nb/libexpat.so
diff --git a/system/lib64/arm64/nb/libft2.so b/src/system/lib64/arm64/nb/libft2.so
similarity index 100%
rename from system/lib64/arm64/nb/libft2.so
rename to src/system/lib64/arm64/nb/libft2.so
diff --git a/system/lib64/arm64/nb/libgui.so b/src/system/lib64/arm64/nb/libgui.so
similarity index 100%
rename from system/lib64/arm64/nb/libgui.so
rename to src/system/lib64/arm64/nb/libgui.so
diff --git a/system/lib64/arm64/nb/libhardware_legacy.so b/src/system/lib64/arm64/nb/libhardware_legacy.so
similarity index 100%
rename from system/lib64/arm64/nb/libhardware_legacy.so
rename to src/system/lib64/arm64/nb/libhardware_legacy.so
diff --git a/system/lib64/arm64/nb/libhwui.so b/src/system/lib64/arm64/nb/libhwui.so
similarity index 100%
rename from system/lib64/arm64/nb/libhwui.so
rename to src/system/lib64/arm64/nb/libhwui.so
diff --git a/system/lib64/arm64/nb/libicui18n.so b/src/system/lib64/arm64/nb/libicui18n.so
similarity index 100%
rename from system/lib64/arm64/nb/libicui18n.so
rename to src/system/lib64/arm64/nb/libicui18n.so
diff --git a/system/lib64/arm64/nb/libicuuc.so b/src/system/lib64/arm64/nb/libicuuc.so
similarity index 100%
rename from system/lib64/arm64/nb/libicuuc.so
rename to src/system/lib64/arm64/nb/libicuuc.so
diff --git a/system/lib64/arm64/nb/libjnigraphics.so b/src/system/lib64/arm64/nb/libjnigraphics.so
similarity index 100%
rename from system/lib64/arm64/nb/libjnigraphics.so
rename to src/system/lib64/arm64/nb/libjnigraphics.so
diff --git a/system/lib64/arm64/nb/liblog.so b/src/system/lib64/arm64/nb/liblog.so
similarity index 100%
rename from system/lib64/arm64/nb/liblog.so
rename to src/system/lib64/arm64/nb/liblog.so
diff --git a/system/lib64/arm64/nb/libm.so b/src/system/lib64/arm64/nb/libm.so
similarity index 100%
rename from system/lib64/arm64/nb/libm.so
rename to src/system/lib64/arm64/nb/libm.so
diff --git a/system/lib64/arm64/nb/libmedia.so b/src/system/lib64/arm64/nb/libmedia.so
similarity index 100%
rename from system/lib64/arm64/nb/libmedia.so
rename to src/system/lib64/arm64/nb/libmedia.so
diff --git a/system/lib64/arm64/nb/libmediandk.so b/src/system/lib64/arm64/nb/libmediandk.so
similarity index 100%
rename from system/lib64/arm64/nb/libmediandk.so
rename to src/system/lib64/arm64/nb/libmediandk.so
diff --git a/system/lib64/arm64/nb/libnativehelper.so b/src/system/lib64/arm64/nb/libnativehelper.so
similarity index 100%
rename from system/lib64/arm64/nb/libnativehelper.so
rename to src/system/lib64/arm64/nb/libnativehelper.so
diff --git a/system/lib64/arm64/nb/libnativewindow.so b/src/system/lib64/arm64/nb/libnativewindow.so
similarity index 100%
rename from system/lib64/arm64/nb/libnativewindow.so
rename to src/system/lib64/arm64/nb/libnativewindow.so
diff --git a/system/lib64/arm64/nb/libneuralnetworks.so b/src/system/lib64/arm64/nb/libneuralnetworks.so
similarity index 100%
rename from system/lib64/arm64/nb/libneuralnetworks.so
rename to src/system/lib64/arm64/nb/libneuralnetworks.so
diff --git a/system/lib64/arm64/nb/libpcre2.so b/src/system/lib64/arm64/nb/libpcre2.so
similarity index 100%
rename from system/lib64/arm64/nb/libpcre2.so
rename to src/system/lib64/arm64/nb/libpcre2.so
diff --git a/system/lib64/arm64/nb/libsqlite.so b/src/system/lib64/arm64/nb/libsqlite.so
similarity index 100%
rename from system/lib64/arm64/nb/libsqlite.so
rename to src/system/lib64/arm64/nb/libsqlite.so
diff --git a/system/lib64/arm64/nb/libssl.so b/src/system/lib64/arm64/nb/libssl.so
similarity index 100%
rename from system/lib64/arm64/nb/libssl.so
rename to src/system/lib64/arm64/nb/libssl.so
diff --git a/system/lib64/arm64/nb/libstagefright.so b/src/system/lib64/arm64/nb/libstagefright.so
similarity index 100%
rename from system/lib64/arm64/nb/libstagefright.so
rename to src/system/lib64/arm64/nb/libstagefright.so
diff --git a/system/lib64/arm64/nb/libstagefright_foundation.so b/src/system/lib64/arm64/nb/libstagefright_foundation.so
similarity index 100%
rename from system/lib64/arm64/nb/libstagefright_foundation.so
rename to src/system/lib64/arm64/nb/libstagefright_foundation.so
diff --git a/system/lib64/arm64/nb/libstdc++.so b/src/system/lib64/arm64/nb/libstdc++.so
similarity index 100%
rename from system/lib64/arm64/nb/libstdc++.so
rename to src/system/lib64/arm64/nb/libstdc++.so
diff --git a/system/lib64/arm64/nb/libsurfaceflinger.so b/src/system/lib64/arm64/nb/libsurfaceflinger.so
similarity index 100%
rename from system/lib64/arm64/nb/libsurfaceflinger.so
rename to src/system/lib64/arm64/nb/libsurfaceflinger.so
diff --git a/system/lib64/arm64/nb/libsync.so b/src/system/lib64/arm64/nb/libsync.so
similarity index 100%
rename from system/lib64/arm64/nb/libsync.so
rename to src/system/lib64/arm64/nb/libsync.so
diff --git a/system/lib64/arm64/nb/libtcb.so b/src/system/lib64/arm64/nb/libtcb.so
similarity index 100%
rename from system/lib64/arm64/nb/libtcb.so
rename to src/system/lib64/arm64/nb/libtcb.so
diff --git a/system/lib64/arm64/nb/libui.so b/src/system/lib64/arm64/nb/libui.so
similarity index 100%
rename from system/lib64/arm64/nb/libui.so
rename to src/system/lib64/arm64/nb/libui.so
diff --git a/system/lib64/arm64/nb/libutils.so b/src/system/lib64/arm64/nb/libutils.so
similarity index 100%
rename from system/lib64/arm64/nb/libutils.so
rename to src/system/lib64/arm64/nb/libutils.so
diff --git a/system/lib64/arm64/nb/libvndksupport.so b/src/system/lib64/arm64/nb/libvndksupport.so
similarity index 100%
rename from system/lib64/arm64/nb/libvndksupport.so
rename to src/system/lib64/arm64/nb/libvndksupport.so
diff --git a/system/lib64/arm64/nb/libvulkan.so b/src/system/lib64/arm64/nb/libvulkan.so
similarity index 100%
rename from system/lib64/arm64/nb/libvulkan.so
rename to src/system/lib64/arm64/nb/libvulkan.so
diff --git a/system/lib64/arm64/nb/libwebviewchromium_plat_support.so b/src/system/lib64/arm64/nb/libwebviewchromium_plat_support.so
similarity index 100%
rename from system/lib64/arm64/nb/libwebviewchromium_plat_support.so
rename to src/system/lib64/arm64/nb/libwebviewchromium_plat_support.so
diff --git a/system/lib64/arm64/nb/libz.so b/src/system/lib64/arm64/nb/libz.so
similarity index 100%
rename from system/lib64/arm64/nb/libz.so
rename to src/system/lib64/arm64/nb/libz.so
diff --git a/system/lib64/arm64/server_configurable_flags.so b/src/system/lib64/arm64/server_configurable_flags.so
similarity index 100%
rename from system/lib64/arm64/server_configurable_flags.so
rename to src/system/lib64/arm64/server_configurable_flags.so
diff --git a/system/lib64/libhoudini.so b/src/system/lib64/libhoudini.so
similarity index 100%
rename from system/lib64/libhoudini.so
rename to src/system/lib64/libhoudini.so
diff --git a/uninstall.sh b/src/uninstall.sh
similarity index 100%
rename from uninstall.sh
rename to src/uninstall.sh