Undoing AOSP's De-Google-fication