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

Change-Id: I93bd4f11b1fc90562cf6919d27da620b1310546e