Merge "AudioFlinger: Fix Tee compilation" into pi-dev am: ed4f0147db
am: f5afe9d02a

Change-Id: I0fbdf6f04146c67b9f65c8a7afd3fa38de2d73a4