Merge "Retire duplicate qemu_pipe and gralloc_cb headers"