Merge "Revert "libhwui: avoid creating GPU context in Zygote""