Merge "Cleanup drm_hal_clearkey_test."