Import sh4 and fulan patches from opendroid