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

Change-Id: I0a7ee9e92621704af6bdc7294ce375e8462e9065