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

Change-Id: Ib8a84b5639268cf27849d8035a4822243c1c4ba3