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

Change-Id: I3d450f4890825f5ad261b01ae9bd1a1b01a640c7
tree: 510fce6eaf589e26cbc1d5ff2a2fba065e1049ad
  1. tests/