Fix fiq_debugger.c with cherry pick errors