Merge "Set close-on-exec flag for bugreportz socket in dumpstate" am: c998eaa1dc am: 7a46cda5f5
am: d61cf64625

Change-Id: I7f55bd0c5c1c7d4e72b2644c569061e6885a4476