[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 4a54666f3e am: adc8026945 am: 6dd431c768 am: 4523eae489

Change-Id: I14943f95747e93f1e85cf560fe63fa11b168c9e3