Revert^2 "Fixing the j.u.c compilation after merge with up..."

This relands change reverted by I1cedd6f34

Test: m
Test: atest CtsLibcoreOjTestCases
Test: atest jsr166.CompletableFutureTest
Test: atest ScreenshotNotificationSmartActionsTest
Test: atest AndroidAsyncFutureTest
Change-Id: Id7f46459e60fec9f6e2f871b77aa7bf5d01fee83
7 files changed