[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
am: 88d43f631a  -s ours

Change-Id: Idf901fae7d4b3a6ebfdf43c4a078ea81635b44de