Merge "Fix `LOCAL_CXX_STL := none` for Windows."