Omni 4.3 branch (also needed for twrp)