Merge "Revert "Always pass down the caller class to nativeLoad when it'..."" into main am: f93de51afd

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2974620

Change-Id: Idb996688fcecda44f903a1d12404aaaf486a8c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>