Merge "Don't make isSafeMode a field on the Zygote class."