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

Change-Id: I578b109bc0a4f8655643dad1092b46296ff18114