DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381
am: 8765ef76ef

Change-Id: Iec8df9cd119dc386d71f38fed7c91c980c596596