Merge "ignore exception calling unlinkToDeath" into oc-dev
am: 79777a5b43

Change-Id: Iaffd850d9422244d92340ac8c5c2346cbb58f39f