Fix build failures with OmniRom 4.4.2