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

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

Change-Id: I39317990d69ea00b68295b99db753604d08a7008