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

Change-Id: Id481b8b89ef6b180ba0099f214a5681e41851af3