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