Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd am: a3da659863 am: cf967da02a
am: 61316803f2 -s ours
Change-Id: Icdf52be53ad5df9a175d10a9a882943f2a48f820
This commit is contained in: