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

Change-Id: Ia84907bfa038954256bc791490a490dd338b33ce