Merge "Switch CtsLibcoreOjTestCases to use AndroidJUnitRunner" into oreo-cts-dev am: 65cfea065d am: 1e84c7a54f am: 5abca29fdf
am: 5490d309af

Change-Id: Ifa1f59e3bfe456bf2f5b8879a174395abe3a901d