Merge "Remove unused declarations." into main am: 488887c8ea am: 0194ba475f

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2775906

Change-Id: Ib8eeb98dcb12ed305352b599f7b32b6454f7ebb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>