Support ignored output in test harness am: 7d765bdd0f
am: bf500c0720

Change-Id: I5c1a6a3afc6cef827785b87a92d001a0ee4cf930