Merge "Add legacy-android-test target containing android.test classes" am: c2051813 am: 78af448c am: 2ac0e2a1 Change-Id: I965734e5064fccf08ae676047078632e7a95f3c7