Merge "cxx_stl_setup is not executed for modules from soong" am: 9b18ed094c
am: a0f2b2a286

Change-Id: I4ff30a7156cd472eac3226d4854e79eaa32d973c