Merge "Add AUDIO_FORMAT_AAC_XHE to type converter" into pi-dev am: 4706f6af73
am: 765c492f0d

Change-Id: I945f0b93cc54e3a79521da5886bbc0f974d7098e