Merge "Input tests no longer use test_per_src"
am: 4cd25fc2a5

Change-Id: Ia8ce4f6ecae5d650722f24a6cade96d9d3834330