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

* commit '1f915a85fedc14757c91e59a62ea6d612ce548bf':
  Optionally emit LPCM audio instead of using AAC in wifi display code