Mark ab/6881855 as merged am: e8c76646fe am: 5e3873983e

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

Change-Id: Ib13cf46f309cc5b3a04b383f5d504ac539102cef