Merge "Revert "Allow java targets to support 1.8 source / target""