[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 am: d6b29883ff
am: 1ce9a79b52  -s ours

Change-Id: I1ef94896496b3ebe14a7befed9d80de95de636aa