Merge "Bug 3361124 Remove drmioserver, continued"