Merge "tests: Remove {old,new}.file." am: 09ce7686f2
am: 14d87881d8

Change-Id: Ic1b92812149af9f94f195c819857fdeb6944af2b