Merge "Add legacy-android-test target containing android.test classes" am: c20518139a
am: 78af448c30

Change-Id: I272502ca8504683f5feb4abf345a2665e99da057