GitLab

Reapply the switch to JDK 8 on aosp/master.

This reverts commit 85bddfde.

Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69