[automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0

Change-Id: Iff1ecd457b2b5dd89eef3d212ba06c52e37475c5