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

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

Change-Id: Ia1f0abbbcdaa2ec7cc9684e2a197c9311aecb3e3