am 75afcc1f: Merge "Use define for drm property keys instead of defining as char pointers"

* commit '75afcc1fa311448cdc1cbb9a9637c066627b7947':
  Use define for drm property keys instead of defining as char pointers