Merge "Upgrade flac to bfd4f13f3eb1f4d4f9f723e343f63eceedb267ba"