Prepare for removal of legacy-test from default targets am: bce5cb3248 am: dbb3cd4162 am: 9e3bee350a
am: aa02bd97ba  -s ours

Change-Id: I8a3eb675a07fa6d49c2ea23df199aa1d4f53fe52