Merge "Explicitly label logd's dependencies in /proc." am: cfdbaf33 am: 82fe6916 am: f9d464b0 -s ours am: 7a516743 -s ours Change-Id: I70a5805a633d37b5dd0dfc44f2ce7c644759a2dc