Merge "cts-tradefed: Update java version check." am: d647afcada am: e8e370425d
am: 3a3000d25c

Change-Id: Id3cf4373089f2dde3e850c8bebe102350be7d734