Merge "Check LEGACY_USE_JAVA7 before using 1.8." am: 239783a7ff
am: efe15f7429

* commit 'efe15f7429bf235437587994c6c45fc8c4682fab':
  Check LEGACY_USE_JAVA7 before using 1.8.