Move legacy-test to test-base am: 2141827700 am: 3f200744ae
am: 14e8a359da  -s ours

Change-Id: I573351f84fc18e4a1b4ca8fe63675e9c87f8113f