Merge "Put android.hardware.drm back into manifests"