Merge "Revert "Sync from GitHub"" am: 6a7611bee8 am: 40c34d5087 am: 91d92637a7

Original change: https://android-review.googlesource.com/c/platform/external/tinyalsa/+/1519786

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e5fd1046372bf2474f503aa06ccc8f77a2564a2