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

Change-Id: I5676bfcc8e5c93b9c69da6defa20a26f9ff85cbb