Merge "Use LOCAL_CXX_STL instead of LOCAL_LDLIBS for proper dependencies."