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

Change-Id: Ifb300ec973ecc6cc09ba588f5963f4cdd51dcb2c