Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72."