Android o preview 4
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: c9998dc674

Change-Id: I9576980cc267f0fdbb86d457acf52ba19bbf7972