Merge "servicemanager : use liblog logs"