Merge "Remove obsolete workaround." into main am: 4fa4354799

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

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