Revert^2 "Optimize FindClass ClassNotFoundException case"
am: 87658f3e88

Change-Id: I4abdf95e4bb4290f0d98c65d0ec28a40880d33c2