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

Change-Id: Id136df0261159884b4d31704ab1747c6d2e5c213