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

Change-Id: I2e4955941ee7794a2b412e76097cb9de014b1dfa