Update rules.mk.patch to trunk