am 1f915a85: Merge "Optionally emit LPCM audio instead of using AAC in wifi...
am 1f915a85: Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev
* commit '1f915a85':
Optionally emit LPCM audio instead of using AAC in wifi display code