Merge "Revert "Revert "Remove legacy-test and legacy-android-test targets""" am: e051b0c95e
am: 643318f4d2

Change-Id: I42f0210c0830bc70a26c21ab638da9d248d91f79