Android N IOT Preview 4 (NIH40E)
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"