Merge "Gracefuly return on detecting wrong AAC format from corrupted files"