[automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours am: f54123577f -s ours

am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e0 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1422379

Change-Id: I52aa4c5101309432f2238dea2cc0e0ea4de8e2b6