Merge "cxx_stl_setup is not executed for modules from soong"