Merge "Correct LOCAL_LDLIBS of adb"