Revert "Merge remote-tracking branch 'aosp/master' into goldfish-opengl-update"

This reverts commit 68f96553bbed161d27f9888f8648c192070bc3a9.

BUG=255449023
Reason for revert: breaks sdk_gphone_x86_64

Change-Id: I0bc0d7313ff4561fdff5b5877e62823f20e4aa22
Merged-In: Icf82a013e9919da13ce75e27c663ee3b88202ed5
185 files changed