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

Change-Id: Ie9ec292bfaa8f2ea6f29daeca624edda6c5e18af