Merge "Use define for drm property keys instead of defining as char pointers"