Remove diff markers, not needed anymore.

Change-Id: I5a3123b772f079ceb441196fee8087b30bb7565f