Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev am: 57e4156ee3
am: 38cf6b0f0e

Change-Id: Ic5d74cc30967e6e4656c9b29f26f6af74cacb26f