Merge "Remove legacy-test and legacy-android-test targets" am: 14daedf747 am: 4a83feb18a
am: 9248379c98

Change-Id: Ia409c6c4596269120386f8ae47d7f6379a1073bf