Merge "Fix order of hidl unlinkToDeath."