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