Merge "Mark android.hardware.drm as an updatable hal"