Merge changes from topic "libflac-to-tot" am: 2e1b09348d

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

Change-Id: I6a4a7b5246b9f5718b6fb75941450bb309ab6ce6