DO NOT MERGE - Merge RQ1A.201205.011 am: c16dc6f5da

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

Change-Id: I61ee2b53635aa76b4f47225eb33db0b6b1cdf6ae