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

Change-Id: I815239dee046c40df5618770c8777c8f632cd7a0