Merge "Add support for LOCAL_NDK_STL_VARIANT := none."
am: 2ad9079305

* commit '2ad9079305cc7aedfcfccf2c360c58502dc7d16e':
  Add support for LOCAL_NDK_STL_VARIANT := none.