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

Change-Id: Ie3f23bd37cb29258bdf785548cbf2d85c457a04e