[automerger] Make dnsmasq more stable. am: f25df86146 am: 284fd86f87 am: 31b84030c5 am: d774c6e919 am: 52450e4dde am: 054c9876ff am: d766eb677e am: 31b103e7d6 am: eaa7e2e6fd am: b3621f9b4e am: 7f14f0ab03 am: 72d580fc91 am: 9bc6963a4a am: 879f5cce1d am: 64cfebf14f am: ed12186037 am: 54f99668df am: 64a1129a8d
am: 7cbe1b1640

Change-Id: I6df0b07733c3e1ec76629b86686c1eec53be02d5