Merge "AAC decoder supports OMX_AUDIO_AACObjectXHE profile" into pi-dev
am: d2530730a9

Change-Id: If4d6e6366146f2c4d7166d6e6b745c183fa25939