Merge "Fix the software AAC decoder's AAC+ detection to ignore malformed frames"