Libxaac remove diag am: 3ec6091ef8 am: 2e74869c0f am: b2025665b4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fb56e59e9fd840508d99c3a266fe5c209ca7d14