[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05

Change-Id: I75bccc4690579a56ec343b735e94d54bbd780e92