Merge "Label system_server's dependencies in sysfs."
am: 975efbe5d2

Change-Id: I1094f07481a6e4f70f3345c699dd13a5b18cf8f0