Android Wear O Preview 3 (Android O Beta 2)
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: dc8b745037

Change-Id: Iea95c36a15d61ec03584a3b1f2ec7ae580e047f7