Prepare for removal of legacy-test from default targets
am: 85d64f51c5

Change-Id: I45352d72a914a1396f93ee96d8684f1d3a29aebe