Merge "Add in-app tracepoints to TouchLatency app." am: 674fd12278
am: b6d12b8bb1

Change-Id: I719439a6323ef38f2f39cd578cc4700b9e70850c