Merge "Move DRM to CloseGuard, add DrmOutputStream."