Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev