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

Change-Id: Ia27f928400ceed95b6704b7b602968dbc14714e4