Merge "Remove Windows workaround in file not built for Windows." into main am:...

Merge "Remove Windows workaround in file not built for Windows." into main am: d091aa44 am: 503121cc am: c1342bc8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760267



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