Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1 am: 2d7a0786b5
am: 42f777bbb6  -s ours

Change-Id: I4af92835d0d5dd7b86d38406636caa723a69f277
tree: 575fa5b27d23d23e4462cb2d47617a5820ebd2ba
  1. tests/