Merge "Add android.hardware.drm@1.4"