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

Change-Id: I586efe7359d03211dd98652e293cbbf624649ec6