am 2299bd4a: am 0b58694d: Merge "Add audio latency measurements"

* commit '2299bd4a391034b11d5618a5dde6a16fb5bd0dee':
  Add audio latency measurements