Merge "servicemanager: always use kernel log"