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

Change-Id: I1ed85c606e688acc20b61ada0fe07978e3e296be