Merge "Add i2c tracing support to atrace"
am: 2630e78f53

Change-Id: Icc06121228858c35b90ef5ad0d4a0ecc470a3909