Merge "Fix order of hidl unlinkToDeath."
am: 720d797c0a

Change-Id: I510a2a7d311471cb259c0857059bb9fe6c99a7e9