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

Change-Id: If9efc719e961e94e408380f483d8f32dd119b235