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

Change-Id: Ifb2b9cb8ef0a7311d11c22aa9e3eab9b7511705c