DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 8415da3381 am: 8765ef76ef am: e9b6807818
am: 78d566fc19  -s ours

Change-Id: Iebff381e12ca0f86c9cb22c856b4c7be3c3a5581