Merge "libFLAC: update from Xiph upstream"