gadget: Revert huawei changes
Rebuild framebuffer & fix merge error