[automerger skipped] Revert^2 "Optimize FindClass ClassNotFoundException case"
am: 72736d90de -s ours
am skip reason: change_id I059abce98fe876d89de35d099647ee673c27343b with SHA1 87658f3e88 is in history

Change-Id: I9be5fa3b0d95b8b7dec0f9c179cd8ecaa5d0b646