Merge "Restore audio tee sink" into nyc-dev
am: 6bceddcaee

* commit '6bceddcaee34e053e7d9656f00890c3b1824ae2a':
  Restore audio tee sink