Merge "oboeservice: hold onto linked binder" am: 6a9d20eebf
am: 51c29bd32d

Change-Id: I21275b83ef3574a4147fa95cb5212a2f572fafe1