Merge "Drop build support for LEGACY_USE_JAVA7." am: 5368131063
am: 28be9906d4

Change-Id: I658ef8523874245ff57c66a15294ba3363f47a67