Merge "Add legacy-test as replacement for core-junit"
am: e75a82a92f

Change-Id: Ifa6b4d9c968878e956ddff71a607af67a84472e6