Merge "Frameworks/base: Use better Class.forName in ZygoteInit"