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

Change-Id: Id4466d91efbbbea558c16463fa42c77ff157c519