Merge "Revert "Revert "Remove legacy-test and legacy-android-test targets""" am: e051b0c9 am: 643318f4 am: a8025a85 Change-Id: Ibe9fce04c43c435764c313f64bf49e03fa826012