[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768

Change-Id: I41f5e9a24af3c7a979c628df1be114185e02a8f7