Merge "Merge branch 'upstream-master'" am: fe424c0786

Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1419088

Change-Id: Iaa0c7167a68b86dcdfb49e2e6c9a9b9e5c9a9298