Android CTS 8.0 Release 15 (5066090)
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: c9998dc674 am: 23e53aa67d
am: 1008414dc5

Change-Id: I081bae19c04cb4a1fd52eb16f517e80939046db1