Merge "audioflinger: fix metadata for OutputTrack" into tm-qpr-dev