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

Change-Id: If998990b94bd36f0ffae26dede85df8ad079093e