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

Change-Id: I5b8f7a0c93e90741f0eba1d0761d2c26e8b24513