Merge "Build: Fix menuselect USAN conflicts"

diff --cc build_tools/cflags.xml
index 763f07eeffdf5670fe9bcd142f0732f71824927a,557ea39c8462e990c026a9ae3f28eeaf6bc4725a..566c3b08f29bd4ae915ae672d4bc879d4f99073b
--- 1/build_tools/cflags.xml
--- 2/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@@ -98,10 -95,8 +97,9 @@@
                        <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>
@@@ -110,11 -104,7 +107,8 @@@
                        <conflict>DEBUG_CHAOS</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>