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

Change-Id: Idf7c94e68175337f2829929e2b331940a5e90dbd