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

Change-Id: I43b81c7a7f8e1fbe4143b0262eaad72d3286f8da