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

Change-Id: I6fc52a2935575149766f681902e8d8dd62f715f8