Merge "Remove Java 8 requirement." am: 4cbbfe1325

Change-Id: I377d8c052ca0c0dbce81d40ea90d65803a1414e8