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

Change-Id: I3ad03691188f287aaea76280aaafc2485fe66a75