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

Change-Id: I1a440b5b020237a9d2e568b2ca3b41b621f7e143