libdrm,intel: rework android header handling