Merge "cxx_stl_setup is not executed for modules from soong" into oc-mr1-dev