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

Change-Id: I175ffb646750fff9865cb7b963c50554f6a870c1