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

Change-Id: I82688070910b342152f4076425ac2fedbf41be7c