Mark ab/6881855 as merged am: fcd87f2b1f am: f5347b1fa0

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

Change-Id: I53d04ddfff183b958e946181a831b5d9fe6f8436