[automerger] Make dnsmasq more stable. am: f25df86146 am: 284fd86f87 am: 31b84030c5 am: d774c6e919 am: 52450e4dde am: 054c9876ff am: d766eb677e

Change-Id: Ifd37c57eb3f713943b47ad88ed9cff99f61decb0