Merge "Store trace files in app-specific dirs." into nyc-dev