DO NOT MERGE - Merge ab/7272582 am: af0ba3e5e2

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

Change-Id: Id361103d6966c72d99076e9971fb8b4337efcaf6