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