Merge "Libcore: Use explicit names for Daemons"