Merge "Support another kind of iso mpeg4 file." into froyo