Merge "stagefright: check aac_frame_length to prevent infinite loop" into...

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08b am: 98248c3f am: 5f3ac389 am: aafbda5a am: b226bba8 am: 8d579abf am: 2b1df000 am: b38111a0 am: fb7c6d91 am: ee1f4684 am: 8486817a am: 0ac01572 am: a06a7750
am: 24145427

Change-Id: I55ab577a8a2cee7d819439a0c6e04d88248523b9