Merge "Merge branch 'upstream-master'" am: fe424c0786 am: ed1776b2c9 am: 5da6bb10ed

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

Change-Id: Ia728907978d7a8c722102af1f42111b69b79a00b