Merge "Retire duplicate qemu_pipe and gralloc_cb headers" am: 90ea14103a

Change-Id: I92c77c37baa4454cad873f86c83e658f3ee4e137