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

Change-Id: Ic4a9ac130a9410a7f2bc6a094aba0c0d0085b7b8