Merge "Fix LOCAL_CXX_STL translation (now maps to stl)." into master-soong