Merge "ART: Use file descriptors handed out by tombstoned for traces." am: 4668c6c8f9
am: 3cc09b7409

Change-Id: I73101a86712bb23520edb9ab676814e6d41d714a