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

Change-Id: I920fe03eb41e0aceab8ba794bdfd53d3a5c75388