[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671
am: f1a2354a3a

Change-Id: I744d3ea898571c5d58329b495f8fc1e9e9cfb730