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

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