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

* commit '9a986a6e682e2c22b5a63637589a88314a83316b':
  Add support for LOCAL_NDK_STL_VARIANT := none.