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

Change-Id: I343856779ec7cde3ef0246ae583766906462a534