Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."