Merge "Remove junit classes from legacy-android-test"
am: 4418418adb

Change-Id: Id2966fd487ff95aa5a8e485756366df804765800