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

* commit 'da196abf10fd9a500fe223952d96cf93ed699983':
  Fix `LOCAL_CXX_STL := none` for Windows.