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

Change-Id: I69a89ba6fac90a454a1d8befe9317af25979ccbf