Revert "Remove workaround for null klass during marking phase"

This reverts commit 6408e9703d489fe35748b1b0887f974992f8eebb.

Reason for revert: The issue has not been fixed yet (b/232091270)

Bug: 232091270
Test: manual
Change-Id: I8b9e579fd6718e92e53f627bffff9eb3f2b0eca1
Merged-In: I8b9e579fd6718e92e53f627bffff9eb3f2b0eca1
(cherry picked from commit ad7963baa715a6638713da338e1def4f32e4a77b)
1 file changed