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

Change-Id: I3bb2c6e954a5d5212c976a1f6e1549a62352423a