Merge "Ignore corrupt aac audio frames and substitute silence." into froyo