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

Change-Id: I00bdd20cd4e215e90b063be2a1265883ed98111f