Merge "Use LOCAL_CXX_STL to select libc++_static."