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

Change-Id: Iefca108075e53bcb59dcb71c3d2c21649d0d1964