Merge "Add support for LOCAL_NDK_STL_VARIANT := none."