Merge "Accept a file descriptor to write bugreport file" am: 117dd2fdea am: 470561ab18
am: e58956977b

Change-Id: I3a603bd8c61f3bbaedd8be980a126971240436e1