Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc18
am: 341a052cf9
am: 5151513a15
-s ours
Change-Id: I1551963c45f5d4b94d1fe42d3405350eda4ca389
main
commit
439ca466de