Merge "Replace a custom AndroidRuntime::findClass with a more targeted fix."