Merge "libbufferhubqueue: remove unused deps" am: 6955914221
am: 8909e3ab34

Change-Id: I619f21bb4b1572c1a94c6c3230b465ee54bc927d