[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a

Change-Id: If3b0d271ec214b0ec04f33639f9276d591665e36