remove a *.orig file left over from a merge

Signed-off-by: Iliyan Malchev <malchev@google.com>
1 file changed