Merge riastradh-drm2 to HEAD.
Missed these. Convert to motorola format.
files moved from arch compat layout