Merge changes from topic "libflac-to-tot" am: 2e1b09348d am: d9983ec9d6 am: 3e096cf257 am: 85ea9efbae am: c4adcaedd4

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

Change-Id: I049ee265dca3f0867dc22b49b57eee6dbf1d11a2