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

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

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