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

Change-Id: I9c5d261b7c9c0f652c733ebc89c44d1295986cf8