Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
am: 6d14940a0e

Change-Id: Id3a55dac1b99cfef7f7372eeac18973936f0c6e6