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

Change-Id: I053e18145da0b87f8c5f8877190b66c5e65fb068