Add patches to build with caf jb_rel_2.0.3