[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d
am: dcbb54a6ec

Change-Id: I86083377cbd5c4c982d5686e22f620ff288abed2