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

Change-Id: Iee202f3c645249109a7f27ba393bb41c50b6b9e8