This reverts commit 1a1398ec. Bug: 72131483 Reason for revert: Broke class_loader_context_test on target Change-Id: Iaa51c8e84536638f39e9ca4c420d1e10ae15e270