Merge "Check LEGACY_USE_JAVA7 before using 1.8."