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

Change-Id: I053bbc39b92045c9be0c935bef8c078a41ce7fe8