Merge "atrace: don't use sendfile." am: c1c9354ad8
am: 86504eb9e6

Change-Id: I1cdcf014bc7d5b40d1ecd20649d6b2c63777aa7a