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

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

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