Merge "Disable UpdateService temporarily."

    sp<ProcessState> proc(ProcessState::self());

    sp<IServiceManager> sm = defaultServiceManager();

    MediaExtractorService::instantiate();

    // TODO: Uncomment below once sepolicy change is landed.

    /*

    char value[PROPERTY_VALUE_MAX];

    property_get("ro.build.type", value, "unknown");

    if (strcmp(value, "userdebug") == 0 || strcmp(value, "eng") == 0) {

        media::MediaExtractorUpdateService::instantiate();

    }

    */

    ProcessState::self()->startThreadPool();

    IPCThreadState::self()->joinThreadPool();

}