Merge "Revert "Remove Java 8 requirement."" am: abf4da89c6

Change-Id: Ie74d424e052aaa2f1c401e00da309a890207d304