Merge "Add METADATA to dnsmasq: GPL=RESTRICTED" am: 89d3389d8a am: b4504cce43 am: c783822b83

Change-Id: I85603beec48195eb83f84f411fbab03c8fb604b1