Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"