Please see bug for context. This reverts commits: * 6111f0cfc8 * bb197bba02 * 20d0aca7e6 And updates prebuilts/api/33.0 accordingly. Bug: 217368496 Tested: builds successfully (barbet-userdebug) Change-Id: If7fcf3d5a2fdb1a48dcaf8ef8f97e8375d461e61
6111f0cfc8
bb197bba02
20d0aca7e6
Bug: 225745567 Test: Build Change-Id: I49fb91c7a60fb1e871bdf3553d978bb16c476fd7 Merged-In: I49fb91c7a60fb1e871bdf3553d978bb16c476fd7 (cherry picked from commit f9a00364c8)
f9a00364c8