Merge "tests: Remove obsolete testdata files." am: f720da5317
am: e9f568e5e5

Change-Id: I7de210eb8643049cc9befde01d67d91d4cd09cc4