Merge "Prepare for removal of legacy-test from default targets" into nyc-mr2-dev-plus-aosp
am: bd014fb0e2  -s ours

Change-Id: Iebf87cf7d5fc62ce8c02e479455a04241c186c87
tree: 4cf8a286578e92569f18a0494512a442eeea5f11
  1. tests/