Merge "Fix incorrect dependence on the system-built liblog."