Merge "Remove libbufferhubqueue, libdisplay and dependencies"