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

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