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

Change-Id: Id432afccbf025527d9024f2711f9de871908f86a