Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev