[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec am: 67e9a995ce
am: fec52a666d

Change-Id: I86182e0f6471b424c5ff47d109986a2c27834f89