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

Change-Id: Ice80a96b140e09ffe1ac65b36f4441e14a1b7950