Merge "Build: Fix menuselect USAN conflicts" into 11

diff --cc build_tools/cflags.xml
index 0b8852b16a377b9f2247cb811bc42fbb7a553f77,5e06ed96bce110472397a790f89637f166dfecfd..1ebbeb9784e5d6fc31d9744ae649cab02a56e0a2
--- 1/build_tools/cflags.xml
--- 2/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@@ -76,22 -73,15 +75,17 @@@
                        <support_level>extended</support_level>
                        <conflict>ADDRESS_SANITIZER</conflict>
                        <conflict>LEAK_SANITIZER</conflict>
-                       <conflict>UNDEFINED_SANITIZER</conflict>
                </member>
                <member name="LEAK_SANITIZER" displayname="Leak Sanitizer">
 +                      <depend>HAVE_LEAK_SANITIZER</depend>
                        <support_level>extended</support_level>
                        <conflict>ADDRESS_SANITIZER</conflict>
                        <conflict>THREAD_SANITIZER</conflict>
                        <conflict>MALLOC_DEBUG</conflict>
                </member>
                <member name="UNDEFINED_SANITIZER" displayname="Undefined Behavior Sanitizer">
 +                      <depend>HAVE_UNDEFINED_SANITIZER</depend>
                        <support_level>extended</support_level>
-                       <conflict>ADDRESS_SANITIZER</conflict>
-                       <conflict>THREAD_SANITIZER</conflict>
-                       <conflict>LEAK_SANITIZER</conflict>
                </member>
                <member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
                        <conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>