Merge "ActivityManager: Add link/unlinkToDeath" into pi-dev am: 100697d60c
am: 4d4c2757b0

Change-Id: Ic70472fc2b42f7104d682f44d4cffa3625d395aa