Merge "Revert "Remove legacy-test and legacy-android-test targets"" am: 049c1589ee am: 7f997d4cfc
am: 95a9dc906f

Change-Id: I1034050336bdf8be84e3b86ae346dc4bfe1737ef