[automerger skipped] Merge "Add IPv6 link-local address generation from EUI-48" am: a2a9df3e3a am: 674479afe5
am: 5faec91513  -s ours

Change-Id: I3121a9d36008857cb244ecbd4fc579cb4ac6e33c