Merge "Remove various bits of dead code and unused workarounds." am: b9c95f8e6a

Change-Id: I2af7c12a361d3f4c6151599e612fc238118b60c8
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: 9f11ee4e9540eafd57834d017487d0e91961abd6
2 files changed