Merge "servicemanager: rely on auto unlinkToDeath" into stage-aosp-master am: f881941614 am: d09f7faef3
am: 18f2ebbd71

Change-Id: I5b46b446b18133199bf817404e8bb40103b9cc12