Android O IOT Preview 5 (OIR1.170720.015)
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"