[kernel/f19] fix arm merge