Merge "Remove legacy-test and legacy-android-test targets"
am: 14daedf747

Change-Id: I67e3a6d58324affcb9119002d4fb2be23e3121fc