Merge "Remove LOCAL_NDK_STL_VARIANT"