Merge "drm hal aidl API cleanup"