Merge "Fix override warnings when two test suites share an output" am: 5f4274609f
am: a0d3365510

Change-Id: Ic0d36e8cfa0addc44e4e9b9b78591f4baf2adc0e