Merge "manifest: Switch to LoS fork of build/blueprint" into q10.0

diff --cc aicp-aosp.xml
index 590c102,09b6036..1d121f8
--- 1/aicp-aosp.xml
--- 2/aicp-aosp.xml
+++ b/aicp-aosp.xml
@@@ -32,9 -32,9 +32,10 @@@
  \r
    <!-- LineageOS AOSP Repos -->\r
    <project path="art" name="LineageOS/android_art" groups="pdk" remote="lineage" />\r
+   <project path="build/blueprint" name="LineageOS/android_build_blueprint" groups="pdk,tradefed" remote="lineage" />\r
    <project path="device/generic/goldfish" name="LineageOS/android_device_generic_goldfish" groups="pdk" remote="lineage" />\r
    <project path="external/libnfc-nxp" name="LineageOS/android_external_libnfc-nxp" remote="lineage" />\r
 +  <project path="external/mksh" name="LineageOS/android_external_mksh" groups="pdk" remote="lineage" />\r
    <project path="external/selinux" name="LineageOS/android_external_selinux" groups="pdk" remote="lineage" />\r
    <project path="external/tinyalsa" name="LineageOS/android_external_tinyalsa" groups="pdk" remote="lineage" />\r
    <project path="external/tinycompress" name="LineageOS/android_external_tinycompress" groups="pdk" remote="lineage" />\r

diff --cc remove.xml
index bb49d64,2e420cd..9e0f1dc
--- 1/remove.xml
--- 2/remove.xml
+++ b/remove.xml
@@@ -6,8 -6,8 +6,9 @@@
    <remove-project name="platform/bionic" />\r
    <remove-project name="platform/bootable/recovery" />\r
    <remove-project name="platform/build" />\r
+   <remove-project name="platform/build/blueprint" />\r
    <remove-project name="platform/build/soong" />\r
 +  <remove-project name="platform/external/mksh" />\r
    <remove-project name="platform/external/openssh" />\r
    <remove-project name="platform/external/selinux" />\r
    <remove-project name="platform/external/tinyalsa" />\r