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

Change-Id: I176a492f1d5faad26b1873ad1803e77398523638