bpo-28538: Revert all the changes (now using Android Unified Headers) (GH-4479)

3 files changed