[automerger skipped] Skip ab/6749736 in stage. am: 298f5c662c -s ours am: 747261116b -s ours am: 4323c58662 -s ours

am skip reason: Change-Id I0ed32ddd6f5957a57c161cf748eacf48b0de4976 with SHA-1 f44a5a1898 is in history

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

Change-Id: I56d5397c96799c99db0f39fd77bca09682c7cbeb