Merge "Add i2c tracing support to atrace"