Merge "Add legacy-test as replacement for core-junit" am: e75a82a92f am: a485fa1fce am: 783096f02c
am: e34370edfd  -s ours

Change-Id: I0a06fd6b8c7c9c860ecf293728c1c0d887b82358