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

Change-Id: If7794ab33010eb4b8200c9bc3984c81c79d96cbc