Using a single proto file for tracing

This avoids proto improt tags which has incompatibility between make and gradle

Test: Verified APK builds
Change-Id: I5a92bbba259815470d67d76a91c3e4d9b2b8cc82
2 files changed